Merge branch 'master' into dev

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

@@ -148,6 +148,14 @@ public class OMSController {
         return omsFeign.undoOrder(map);
     }
 
+    @ApiOperation(value = "撤销已拒绝")
+    @PostMapping("/refuseCtrlZ")
+    public Map<String,Object> refuseCtrlZ(@RequestBody Map<String,Object> map){
+        return omsFeign.refuseCtrlZ(map);
+    }
+
+
+
     @ApiOperation(value="司机接单信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -432,5 +432,9 @@ public interface OmsFeign {
     @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")
     @PostMapping("api/v1/oms/omstruckorderseparates/getAllLoadUnloadResult")
     Map<String, Object> getAllLoadUnloadResult(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @ApiOperation(value = "撤销已拒绝")
+    @PostMapping("api/v1/oms/omstruckorders/refuseCtrlZ")
+    Map<String, Object> refuseCtrlZ(Map<String, Object> map);
 }
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8