From eb61ca85ef0f8c91afadfcf7763b307b87ac9a97 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 08 十二月 2023 17:18:10 +0800
Subject: [PATCH] 修改金汇社区资源清单筛选

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java
index 029e5a4..c2c89ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightResourceSharingApi.java
@@ -22,8 +22,10 @@
     public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                      @RequestParam("pageSize") int pageSize,
                      @RequestParam(value = "communityId", required = false)String communityId,
-                     @RequestParam(value = "unitId", required = false)String unitId) {
-        return R.ok(sharingService.getList(pageNum, pageSize, communityId, unitId));
+                     @RequestParam(value = "unitId", required = false) String unitId,
+                     @RequestParam(value = "meritId", required = false) String meritId)
+    {
+        return R.ok(sharingService.getList(pageNum, pageSize, communityId, unitId,meritId));
     }
 
     @GetMapping("/getResourceSharingDetails")

--
Gitblit v1.7.1