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

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

@@ -651,11 +651,12 @@ public class OMSController {
                                                   Integer orderStatus,
                                                   String carrierId,
                                                   String con,
-                                                     Integer planEnableStatus) {
+                                                     Integer planEnableStatus,
+                                                     String userId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus);
+        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus,userId);
         return map;
     }
 

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

@@ -449,7 +449,8 @@ public interface OmsFeign {
                                            @RequestParam Integer orderStatus,
                                            @RequestParam String carrierId,
                                            @RequestParam String con,
-                                              @RequestParam Integer planEnableStatus);
+                                              @RequestParam Integer planEnableStatus,
+                                              @RequestParam String userId);
 
 
     @ApiOperation(value = "装卸工查询自己所有装了货的订单信息")