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

# Conflicts:
#	src/biz/fuHuqQi/base.ts

src/biz/fuHuqQi/base.ts

@@ -96,12 +96,19 @@ export async function fuHuaQiBaseList(lv:number, institutionalNature:number, ind
     let enterpriseMap = await groupFindEnterprise();//企业总数
 
     let dataBaseList = await findFuHuaQiListByPage(selectParam, (page-1)*10 );
+
     let count = await findFuHuaQiCount(selectParam);
     let dataList = [];
 
     dataBaseList.forEach( info => {
         let changeData:any = tools.extractData(FuHuaQiBaseListConfig, info);
-
+        // let hatchingGround = info.hatchingGround;
+        // hatchingGround.forEach (info => {
+        //     let {personInChargeAdd, siteAcreage, leasePrice} = info;
+        //     changeData.personInChargeAdd = personInChargeAdd;
+        //     changeData.siteAcreage = siteAcreage;
+        //     changeData.leasePrice = leasePrice;
+        // })
         let enterpriseTotal = enterpriseMap[info.uscc] || 0;
         let numOfEntities = enterpriseTotal - (info.virtualEnterpriseNum || 0 );
         numOfEntities = numOfEntities < 0 ? 0 : numOfEntities;

src/config/ojbectResultKeyConfig.ts

@@ -19,9 +19,7 @@ export const FuHuaQiBaseListConfig = {
     liaisonPhone:{key:"联系电话"},
     personInCharge:{key:"负责人"},
     personInChargePhone:{key:"负责人联系电话"},
-    personInChargeAdd:{key:"孵化场地地址"},
-    siteAcreage:{key:"孵化场地面积(㎡)"},
-    leasePrice:{key:"孵化场地出租单价"},
+    hatchingGround:{key:"经备案孵化场地"},
 };
 
 /**

src/routers/admin.ts

@@ -130,7 +130,11 @@ async function getMonthList(req, res) {
     res.success(result);
 }
 
-
+/**
+ * 后台管理 新增孵化器账号
+ * @param req 
+ * @param res 
+ */
 async function addUser(req, res) {
     let reqConf = {form: 'Object' };
     let { form } = checkReqParam(reqConf, req.body);
@@ -140,6 +144,11 @@ async function addUser(req, res) {
 } 
 
 
+/**
+ * 所属孵化器
+ * @param req 
+ * @param res 
+ */
 async function affiliationFuHuaQi(req, res) {
     let  result = await enterpriseBiz.getAffiliationFuHuaQi();
     res.success(result);