From 245eb51063dca6bcb9c67c5b4b400b6f2b04453a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 22 九月 2021 16:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 9f10334..8941552 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
@@ -127,6 +127,16 @@
     R changePassword(@RequestBody ChangePasswordVO changePasswordVO);
 
     /**
+     * 重置密码用户登录密码默认admin123456
+     *
+     * @param userId
+     *            新密码
+     * @return 修改结果
+     */
+    @GetMapping("resetPassword")
+    R resetPassword(@RequestParam("userId") Long userId);
+
+    /**
      * 某社区后台人员查询
      * 
      * @param param
@@ -312,6 +322,16 @@
     R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
 
     /**
+     * 新增社区后台物业,社会组织,业主委员会账户
+     *
+     * @param administratorsUserVO
+     *            账户信息
+     * @return 新增结果
+     */
+    @PostMapping("adduserbackstageproperty")
+    R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+    /**
      * 编辑运营、社区后台账户
      * 
      * @param administratorsUserVO

--
Gitblit v1.7.1