From e66b132b13fb50dd49361e19932791afc51b53a8 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 17 八月 2021 15:49:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index f40d6ca..c909091 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -77,6 +77,14 @@
      * @return 人员集合
      */
     R listActivityManager(String param, Long communityId);
+
+    /**
+     * 微心愿搜索社区团队人员列表
+     * @param param 请求参数
+     * @param communityId   社区id
+     * @return  社区团队人员列表
+     */
+    R listActivityManager2(String param, Long communityId);
     /**
      *分页查询人脸识别
      * @param loginUserInfoVO 查询参数

--
Gitblit v1.7.1