From 438e0309b09a70224d6e5be0d60ac5b52aa6df48 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 30 九月 2021 09:34:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 51bb0f8..a57fd40 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
@@ -704,7 +704,7 @@
     /**
      * 批量重置密码
      */
-    R resetPasswordPatch(Long[] userId);
+    R resetPasswordPatch(Long[] userId,String password);
 
     /**
      * 便民服务新增商家账号
@@ -727,4 +727,10 @@
      * @return
      */
     R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+    /**
+     * 根据openid维护社区团队里是否注册
+     * @param openid    用户微信唯一标识
+     */
+    void judgeCommunityTeam(String openid);
 }

--
Gitblit v1.7.1