Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -566,8 +566,8 @@ public class OMSController {
 
     @ApiOperation(value="根据运单id关闭订单")
     @PostMapping("/closeOmstruckOrder")
-    public Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId) {
-        Map<String, Object> map = omsFeign.closeOmstruckOrder(orderId);
+    public Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> mapVal) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(mapVal);
         return map;
     }
 

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -298,7 +298,7 @@ public interface OmsFeign {
 
     @ApiOperation(value="根据运单id关闭订单")
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
-    Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
+    Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> map);
 
 
     @ApiOperation(value="根据运单id修改运力")