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

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

@@ -1755,8 +1755,11 @@ public class AMScontroller{
     }
 
     @PostMapping(value = "/getNoticeUser", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map) {
-        return amsFeign.getNoticeUser(map);
+    public Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("apiId") Integer apiId) {
+        return amsFeign.getNoticeUser(map,pageNum,pageSize,apiId);
     }
 
     @PostMapping(value = "/getNoticeAll", produces  = "application/json;charset=UTF-8")

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

@@ -1534,7 +1534,10 @@ public interface AmsFeign {
     Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/dilnotices/getNoticeUser")
-    Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId);
 
     @PostMapping(value = "api/v1/ams/dilnotices/getNoticeAll")
     Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map);