tj3

igirl-channel-gateway/app/config/routes/api.js

@@ -273,11 +273,7 @@ module.exports = function (app) {
 				await logCtl.applicationOctetStream2Json(req);
 			}
 			var client_ip = system.get_client_ip(req);
-<<<<<<< HEAD
 			req.body.action_type = "icpSubmitNeed";
-=======
-			req.body.action_type = "submitNeed";
->>>>>>> 1631774356a4d0d7696a7ea7626878ed46926858
 			var result = await gatewaypushlogSve.icpSubmitNeed(req.body, client_ip);
 			logCtl.info({
 				optitle: (new Date()).Format("yyyy-MM-dd hh:mm:ss") + "回调处理订单结果：，method=" + req.body.trxcode,