Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

# Conflicts:
#	src/biz/member/homePage.ts

src/biz/member/homePage.ts

@@ -531,8 +531,9 @@ export async function isNeedSupplement({userId}) {
     //     "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", 
     //     "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"]
     // };
-    const DwRequiredConf = {
-        "基本信息": ["sheng", "shi", "qu", "addres", "contactPerson", "contactPersonDuties", "phone"],// "applicationForm"
+        // "基本信息": ["sheng", "shi", "qu", "addres", "contactPerson", "contactPersonDuties", "phone"],// "applicationForm"
+    const DwRequiredConf = { //, "contactPerson", "contactPersonDuties", "applicationForm"
+        "基本信息": ["unitName", "sheng", "shi", "qu", "addres", "uscc", "legalPerson", "legalPersonPhone", "phone", "mail", "uusinessLicenseUrl"],
         "单位信息": ["yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", 
         "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", 
         "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"]

src/routers/member/router.ts

@@ -239,8 +239,8 @@ export const Config = {
                         legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:true},
                         legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:true},
                         // unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false},  2024.4.22日的需求 去掉
-                        contactPerson:{type:'String', desc:'日常联系人', notMustHave:true},
-                        contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:true},
+                        // contactPerson:{type:'String', desc:'日常联系人', notMustHave:true},
+                        // contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:true},
                         phone:{type:'String', desc:'日常联系人手机', notMustHave:true},
                         mail:{type:'String', desc:'日常联系人邮箱', notMustHave:true},
                         uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:true},
@@ -1313,19 +1313,19 @@ export const Config = {
                         shi:{type:'String', desc:'市', notMustHave:false},
                         qu:{type:'String', desc:'区', notMustHave:false},
                         addres:{type:'String', desc:'通信地址', notMustHave:false},
-                        // uscc:{type:'String', desc:'单位信用代码', notMustHave:false},
-                        // legalPerson:{type:'String', desc:'法人代表', notMustHave:false},
-                        // legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:false},
-                        // legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:false},
+                        uscc:{type:'String', desc:'单位信用代码', notMustHave:false},
+                        legalPerson:{type:'String', desc:'法人代表', notMustHave:false},
+                        legalPersonPhone:{type:'String', desc:'法人联系电话', notMustHave:false},
+                        legalPersonMail:{type:'String', desc:'法人邮箱', notMustHave:false},
                         // unitMail:{type:'String', desc:'单位电子邮箱', notMustHave:false},  2024.4.22日的需求 去掉
                         // contactPerson:{type:'String', desc:'日常联系人', notMustHave:false},
                         // contactPersonDuties:{type:'String', desc:'日常联系人职务', notMustHave:false},
                         phone:{type:'String', desc:'日常联系人手机', notMustHave:false},
                         mail:{type:'String', desc:'日常联系人邮箱', notMustHave:false},
-                        // uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:false},
+                        uusinessLicenseUrl:{type:'String', desc:'营业执照复印件', notMustHave:false},
                         /**单位信息 */
-                        // unitMemberType:{type:'Number', desc:'单位信息类型，枚举', notMustHave:false},
-                        // yuanXiaoBanXueLeiXing:{type:'Number', desc:'院校办学类型，枚举', notMustHave:false},
+                        unitMemberType:{type:'Number', desc:'单位信息类型，枚举', notMustHave:false},
+                        yuanXiaoBanXueLeiXing:{type:'Number', desc:'院校办学类型，枚举', notMustHave:false},
                         yuanXiaoZhuGuanBuMen:{type:'String', desc:'院校主管部门', notMustHave:false},
                         yuanXiaoFuZeRen:{type:'String', desc:'院校主要负责人', notMustHave:false},
                         yuanXiaoFuZeRenZhiWu:{type:'String', desc:'院校主要负责人职务', notMustHave:false},