Merge remote-tracking branch 'origin/master'

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

@@ -654,11 +654,13 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageSize,
                                                          Integer apiId,
                                                          Integer status,
-                                                         @RequestParam(required = false) String con) {
+                                                         @RequestParam(required = false) String con,
+                                                         @RequestParam(required = false) String startTime,
+                                                         @RequestParam(required = false) String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
     }
 
     @PostMapping("insertDeliveryNotice")

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

@@ -749,7 +749,9 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer  status,
-                                                  @RequestParam(required = false) String con);
+                                                  @RequestParam(required = false) String con,
+                                                  @RequestParam String startTime,
+                                                  @RequestParam String endTime);
 
     /**
      * 新增放货通知