From faae303cd25f90b1c732b6bc737ede8b8ab714a0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 16:56:28 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 9c9d95f..edfdb33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -139,6 +139,18 @@
     }
 
     /**
+     * 批量重置密码
+     *
+     * @param userId
+     *            新密码
+     * @return 修改结果
+     */
+    @GetMapping("resetPasswordPatch")
+    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId,@RequestParam("password")String password) {
+        return userService.resetPasswordPatch(userId,password);
+    }
+
+    /**
      * 某社区后台人员查询
      *
      * @param param
@@ -1180,4 +1192,13 @@
     public R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
         return userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
     }
+
+    /**
+     * 根据openid维护社区团队里是否注册
+     * @param openid    用户微信唯一标识
+     */
+    @PostMapping("judgeCommunityTeam")
+    public void judgeCommunityTeam(@RequestParam("openid") String openid) {
+        userService.judgeCommunityTeam(openid);
+    }
 }

--
Gitblit v1.7.1