From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 bb162d8..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);
@@ -383,6 +384,13 @@
@RequestParam("phoneOrname") String phoneOrname);
+
+ @GetMapping("/FightConvenient/selectUserListB")
+ public R selectUserListB(@RequestParam("communityId") String communityId,
+ @RequestParam("phoneOrname") String phoneOrname);
+
+
+
@GetMapping("/FightConvenient/selectUserBind")
public R selectUserBind(@RequestParam("communityId") String communityId,
@RequestParam("userId") String userId);
--
Gitblit v1.7.1