laolan

673576e5 · 兰国旗 · 98fe24a5 · 673576e5
Commit 673576e5 authored Nov 06, 2020 by 兰国旗
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 6 deletions

center-channel/app/config/businessConfig.js
+1 -6

No files found.
--- a/center-channel/app/config/businessConfig.js
+++ b/center-channel/app/config/businessConfig.js
@@ -18,12 +18,7 @@ module.exports = {
            "foodCloseNeed", "foodRecordLog", "foodRecordLogList", "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo", "putUserMobileByVcode",
            "putUserPwdByMobile", "icpNotifyNew"
        ],
-<<<<<<< HEAD
+        apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo", "icpNotifyNew", "submitIcpProgramme","serviceProviderSubmitMaterial","abolishIcpProgramme","submitService","serviceProviderNotification"],
-        apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo", "icpNotifyNew", "submitIcpProgramme","serviceProviderSubmitMaterial","abolishIcpProgramme","serviceProviderNotification"],
-        apiSecretPathList: ["/api/icp/consultation/submit","/api/icp/feedback/submit","/api/icp/order/notify"]
-=======
-        apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo", "icpNotifyNew", "submitIcpProgramme","serviceProviderSubmitMaterial","abolishIcpProgramme","submitService"],
        apiSecretPathList: ["/api/icp/consultation/submit","/api/icp/feedback/submit","/api/icp/order/notify","/api/opreceive/service/create","/api/icp/order/close","/api/opreceive/service/notify"]
->>>>>>> 6341c45c21c448304176aa0b36216c1b9bd5f379
    }
 }