From 7a282d69e08d875a016975ea4b980bec98a9bab8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 18:06:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 7c60c03..51bb0f8 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
@@ -702,6 +702,11 @@
     R resetPassword(Long userId);
 
     /**
+     * 批量重置密码
+     */
+    R resetPasswordPatch(Long[] userId);
+
+    /**
      * 便民服务新增商家账号
      * @param convenientMerchantDTO
      * @return 商家用户id

--
Gitblit v1.7.1