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/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 c9edf37..68fdaa7 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
@@ -125,6 +125,18 @@
     }
 
     /**
+     * 重置密码
+     *
+     * @param userId
+     *            新密码
+     * @return 修改结果
+     */
+    @GetMapping("resetPassword")
+    public R resetPassword(@RequestParam("userId") Long userId) {
+        return userService.resetPassword(userId);
+    }
+
+    /**
      * 某社区后台人员查询
      *
      * @param param
@@ -369,6 +381,19 @@
     }
 
     /**
+     * 新增社区后台物业,社会组织,业主委员会账户
+     *
+     * @param administratorsUserVO
+     *            账户信息
+     * @return 新增结果
+     */
+    @PostMapping("adduserbackstageproperty")
+    public R adduserbackstageproperty(@RequestBody AdministratorsUserVO administratorsUserVO) {
+
+        return userService.addUserBackstageProperty(administratorsUserVO);
+    }
+
+    /**
      * 删除后台用户
      *
      * @param administratorsUserVO

--
Gitblit v1.7.1