From f7b14aa7b17d465f82d8213d0c9949ffdeae4533 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:40:07 +0800
Subject: [PATCH] 双争双评积分

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
index b0e3976..3bc31e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -250,7 +250,8 @@
     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);
+                                    @RequestParam(value = "unitId", required = false)String unitId,
+                                    @RequestParam(value = "meritId", required = false) String meritId);
 
     @GetMapping("/ResourceSharing/getResourceSharingDetails")
     public R getResourceSharingDetails(@RequestParam("id") String id);
@@ -384,7 +385,7 @@
 
 
 
-    @GetMapping("/selectUserListB")
+    @GetMapping("/FightConvenient/selectUserListB")
     public R selectUserListB(@RequestParam("communityId") String communityId,
                              @RequestParam("phoneOrname") String phoneOrname);
 

--
Gitblit v1.7.1