From c0846f715052bfaa5c25054b8d6fe9fa419da374 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 26 九月 2021 15:15:10 +0800
Subject: [PATCH] Merge branch 'four_member' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    2 +-
 1 files changed, 1 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 d9494da..c945acd 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
@@ -146,7 +146,7 @@
      * @return 修改结果
      */
     @GetMapping("resetPasswordPatch")
-    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds);
+    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
 
     /**
      * 某社区后台人员查询

--
Gitblit v1.7.1