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

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

@@ -2267,9 +2267,10 @@ public class TMSController extends BaseRESTfulController {
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  String startTime,
-                                                 String endTime
+                                                 String endTime,BigDecimal orderType, String index, String isPage,String orgCode
+
     ){
-        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+        return tmsTruckFeign.getInwardReportForAssemble(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,orderType,index,isPage,orgCode);
     }
 
 

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

@@ -547,7 +547,11 @@ public interface TmsTruckFeign {
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
                                           @RequestParam String startTime,
-                                          @RequestParam String endTime);
+                                          @RequestParam String endTime,
+                                                   @RequestParam BigDecimal orderType,
+                                                   @RequestParam String index,
+                                                   @RequestParam String isPage,
+                                                   @RequestParam String orgCode);
 
 
     @PostMapping("api/v1/truckTms/statisticalReport/getCapacityByDefend")