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

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

@@ -1068,11 +1068,12 @@ public class AMScontroller{
                                                 Integer apiId,
                                                 Integer planStatus,
                                                 String carrierId,
-                                                Integer planId) {
+                                                Integer planId,
+                                                String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId,con);
     }
 
     @ApiModelProperty(value = "展示运输计划")

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

@@ -1142,7 +1142,8 @@ public interface AmsFeign {
                                          @RequestParam Integer apiId,
                                          @RequestParam Integer planStatus,
                                          @RequestParam String carrierId,
-                                         @RequestParam Integer planId);
+                                         @RequestParam Integer planId,
+                                         @RequestParam String con);
 
     @ApiOperation(value="展示运输计划下的运输订单")
     @ApiImplicitParams({