Commit 51d2db86 by 兰国旗

laolan

parent 31bfd7bf
...@@ -283,11 +283,8 @@ module.exports = function (app) { ...@@ -283,11 +283,8 @@ module.exports = function (app) {
"tmAccept", "tmStatus", "tmAccept", "tmStatus",
"needBatchUpload", "needBatchUpload",
"serviceSubmitOption","submitWangwenSolution","closeNeed","recordLog","recordLogList", "serviceSubmitOption","submitWangwenSolution","closeNeed","recordLog","recordLogList",
<<<<<<< HEAD "foodServiceSubmitOption","submitFoodSolution","foodCloseNeed","foodRecordLog","foodRecordLogList",
"foodServiceSubmitOption","submitFoodSolution","foodCloseNeed","foodRecordLog","foodRecordLogList"
=======
"getParamsFor360","addOrderWeb", "getParamsFor360","addOrderWeb",
>>>>>>> 289c60b02337e3420c39c1df54cda8d424447d4e
]; ];
if (lst.indexOf(req.body.actionType) >= 0) { if (lst.indexOf(req.body.actionType) >= 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment