fix

center-order/app/base/db/impl/dbneed/diagnosisDao.js

@@ -11,7 +11,6 @@ class diagnosisDao extends Dao {
     return await this.model.update(param, { where: { id } })
     return await this.model.update(param, { where: { id } })
   }
   }
 
 
-<<<<<<< HEAD
   async findOneOrderByCreateAt (uid) {
   async findOneOrderByCreateAt (uid) {
     return await this.model.findOne({
     return await this.model.findOne({
       where: {
       where: {
@@ -23,7 +22,5 @@ class diagnosisDao extends Dao {
       raw: true
       raw: true
     });
     });
   }
   }
-=======
->>>>>>> 54e1b2abd183bb4b792de95cff06b721a760daa4
 }
 }
 module.exports = diagnosisDao;
 module.exports = diagnosisDao;
\ No newline at end of file

center-order/app/base/service/impl/dbneed/diagnosisSve.js

@@ -34,7 +34,7 @@ class DiagnosisService extends ServiceBase {
       diagnosis_mode: actionBody.diagnosisMode, // 诊断方式，这里由channel项目调用带参数
       diagnosis_mode: actionBody.diagnosisMode, // 诊断方式，这里由channel项目调用带参数
       diagnosis_result: "rgshz", // 创建订单时 人工审核中 前台用
       diagnosis_result: "rgshz", // 创建订单时 人工审核中 前台用
       status: "dcl", // 创建订单时 待处理 后台用
       status: "dcl", // 创建订单时 待处理 后台用
-      main_class = actionBody.mainClass,// 运营后台-诊断详情-主营类目
+      main_class: actionBody.mainClass, // 运营后台-诊断详情-主营类目
       qualifications_pic: actionBody.qualificationsPic,
       qualifications_pic: actionBody.qualificationsPic,
       brand_pic: actionBody.brandPic,
       brand_pic: actionBody.brandPic,
       industry_pic: actionBody.industryPic
       industry_pic: actionBody.industryPic