submitNeed push / submitIcpProgramme push

center-channel/app/base/service/impl/common/qcCenterOrderSve.js

@@ -56,7 +56,6 @@ class QcCenterOrderService extends AppServiceBase {
       //推送方案
       await this.pushIcpSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
 
-<<<<<<< HEAD
       // 2020 0806 lin 新增推送
       var reqParams = {
         actionType: "produceData",// Y 功能名称
@@ -72,8 +71,6 @@ class QcCenterOrderService extends AppServiceBase {
       }
       this.opQueuePushClientPost(pobj, this.opPushQueueUrl, reqParams);
 
-=======
->>>>>>> 8560e89423a2072bbcaa023809d8b0a6f8a1b0c1
       return system.getResultSuccess();
     }
     return res;