Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -854,4 +854,10 @@ public class AMScontroller  extends BaseRESTfulController {
     RESTfulResult selectBalanceRemark(@RequestBody Map<String,Object> map) {
         return amsFeign.selectBalanceRemark(map);
     }
+
+    @ApiOperation("销售物流单停用或启用")
+    @PostMapping("/deactivateOrEnable")
+    RESTfulResult deactivateOrEnable(@RequestBody Map<String,Object> map) {
+        return amsFeign.deactivateOrEnable(map);
+    }
 }

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

@@ -317,4 +317,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectBalanceRemark")
     RESTfulResult selectBalanceRemark(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/deactivateOrEnable")
+    RESTfulResult deactivateOrEnable(@RequestBody Map<String, Object> map);
 }