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

src/biz/member/homePage.ts

@@ -21,7 +21,7 @@ import { eccEnumValue } from "../../util/verificationEnum";
  * 会员信息展示
  * @param userId 登录的用户id
  * @returns 个人会员：{头部数据， 基本信息， 专业信息， 其他附件}
- * @returns 专业会员：{头部数据， 基本信息， 单位信息， 单位所获得科研成果}
+ * @returns 单位会员：{头部数据， 基本信息， 单位信息， 单位所获得科研成果}
  */
 export async function getMemberData({userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId});

src/routers/member/router.ts

@@ -318,8 +318,8 @@ export const Config = {
                         addres:{type:'String', desc:'通信地址'},
                         photoUrl:{type:'String', desc:'蓝底证件照'},
                         /**专业信息 */
-                        workUnit:{type:'String', desc:'工作单位'},
-                        memberLevel:{type:'Number', desc:'会员等级职务'},
+                        unitName:{type:'String', desc:'工作单位'},
+                        duties:{type:'String', desc:'职务'},
                         workTitle:{type:'String', desc:'职称'},
                         profCategory:{type:'Number', desc:'专业类别'},
                         studyResume:{type:'String', desc:'学习简历'},

src/routers/order/router.ts

@@ -54,7 +54,6 @@ export const Config = {
                 {key:"unitName", type:"String", desc:"单位名称", isNull:true},
                 {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
                 {key:"isPay", type:"Number", desc:"是否支付", isNull:true},
-                {key:"invoiceStatus", type:"Number", desc:"发票类型", isNull:true},
                 {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
             ],
             bindBiz:orderBiz.billStateList

src/routers/router.ts

@@ -18,7 +18,7 @@ import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
 
-const Look = false;//true更新文档
+const Look = true;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {