From e11e6f0751222b1a6dd356bf54ead9e597c9c2ea Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 27 九月 2022 16:49:16 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   14 +++++++++++++-
 1 files changed, 13 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 b176569..1c5a397 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
@@ -1275,8 +1275,20 @@
     @PostMapping("/tfLogin")
     R tfLogin(@RequestBody UuLoginVO uuLoginVO);
 
+    /**
+     * 三说会堂添加后台账户
+     * */
+    @PostMapping("/sanshuoAddUser")
+    R sanShuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+    /**
+     * 三说会堂重置密码
+     * */
+    @GetMapping("/sanshuoResetPassword")
+    R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);
+
 
     @GetMapping("/accept")
-     R accept(Long userId);
+     R accept(@RequestParam("userId")Long userId);
 
 }

--
Gitblit v1.7.1