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

src/biz/fuHuqQi/task.ts

@@ -29,7 +29,7 @@ import { getLastTimeKey, getTaskId, getTaskIdByTime, getTimeKey } from "../../to
  * 孵化器的任务列表
  * 小程序端
  * @param uscc 孵化器统一信用
- * @returns [{type:1, title:'', enterpriseList:[] }]
+ * @returns [{key:1, title:'', enterpriseList:[] }]
  */
 export async function fuHuaQiTaskList(uscc:string) {
     /**得到这个月的任务map  taskMap格式为{type:{isSubmit}} */

src/config/splitResultConfig.ts

@@ -103,7 +103,7 @@ export const EnterpriseFinancingInfoConfig = {
  * 备注:     导出和列表共用一份配置
  */
 export const EnterpriseListConfig = {
-    name:{key:"企业 名称"},
+    name:{key:"企业名称"},
     createTime:{key:"入库时间 不可修改", changeDate:true},
     fuhuaqiUscc:{key:"孵化器统一信用代码 不可修改 这里显示运营机构的名称"},
     uscc:{key:"统一信用代码 也是登录账号 不可修改"},
@@ -194,7 +194,7 @@ export const FuHuaQiBaseDataConfig = {
     virtualEnterpriseNum:{key:"虚拟企业数量"},
     incubatedAcreage:{key:"在孵面积"},
     acreageTotal:{key:"孵化器总面积"},
-    acreagePersonalUse:{key:"/孵化器自用面积"},
+    acreagePersonalUse:{key:"孵化器自用面积"},
     hatchingGround:{key:"经备案孵化场地"}
 }
 

src/routers/mobileClient/enterprise.ts

 /**
- * 小程序端  孵化器入口  融资相关路由
+ * 小程序端  孵化器入口  企业相关路由
  */
 
 import * as asyncHandler from 'express-async-handler';

src/routers/mobileClient/financing.ts

@@ -12,7 +12,7 @@ export function setRouter(httpServer) {
     httpServer.post('/fuhuaqi/financing/update', checkFuHuaQiToken, asyncHandler(updateFinancingInfo));
     httpServer.post('/fuhuaqi/financing/select', checkFuHuaQiToken, asyncHandler(selectEnterpriseFinancingInfo));
     httpServer.post('/fuhuaqi/financing/delete', checkFuHuaQiToken, asyncHandler(delEnterpriseFinancingInfo));
-    httpServer.post('/admin/financing/namelist', checkFuHuaQiToken, asyncHandler(getFinancingInfoByName));
+    httpServer.post('/admin/financing/namelist', checkFuHuaQiToken, asyncHandler(getFinancingInfoByName)); // todo 路由名称不对
 }
 
 

src/routers/public.ts

@@ -19,7 +19,7 @@ export function setRouter(httpServer) {
 
 
 /**
- * 最高学历
+ * 融资轮次
  * @param req 
  * @param res 
  */