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/api/UserApi.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 850628f..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
@@ -146,8 +146,8 @@
* @return 修改结果
*/
@GetMapping("resetPasswordPatch")
- public R resetPasswordPatch(@RequestParam("userIds") Long[] userId) {
- return userService.resetPasswordPatch(userId);
+ public R resetPasswordPatch(@RequestParam("userIds") Long[] userId,@RequestParam("password")String password) {
+ return userService.resetPasswordPatch(userId,password);
}
/**
@@ -1192,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