From f471925b9c18e816c070cbf4a9c581c8cadfeff5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 16:20:57 +0800
Subject: [PATCH] Merge branch 'four_member' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index e4ba4a2..94326a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -139,6 +139,16 @@
R resetPassword(@RequestParam("userId") Long userId);
/**
+ * 批量重置密码用户登录密码默认admin123456
+ *
+ * @param userIds
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPasswordPatch")
+ R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
+
+ /**
* 某社区后台人员查询
*
* @param param
@@ -361,7 +371,7 @@
* @return 角色集合
*/
@PostMapping("/role/listrolebackstage")
- R listRoleBackstage(@RequestParam("communityId") Long communityId);
+ R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
/**
* 分页查询后台用户
--
Gitblit v1.7.1