From 2ebd707749baac527ef501a531467245e3dd5cdd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 26 九月 2022 10:11:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 d2488b7..11ad032 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
@@ -1442,12 +1442,33 @@
}
@GetMapping("/resetPasswordAccount")
- public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){
- return userService.resetPassword(type,account);
+ public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
+ return userService.resetPassword(type,account,appId);
}
@PostMapping("/tfLogin")
public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
return userService.tfLogin(uuLoginVO);
}
+
+ /**
+ * 三说会堂新增业务中心或专家账号
+ * */
+ @PostMapping("/sanshuoAddUser")
+ public R sanshuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.addExpertOrIndustryCenter(administratorsUserVO);
+ }
+
+ /**
+ * 三说会堂后台重置密码
+ * */
+ @GetMapping("/sanshuoResetPassword")
+ public R sanshuoAddUser(@RequestParam("account") String account,@RequestParam("pass")String password){
+ return userService.resetPassExpertOrIndustryCenter(account,password);
+ }
+
+ @GetMapping("/accept")
+ public R accept(@RequestParam("userId")Long userId){
+ return userService.accept(userId);
+ }
}
--
Gitblit v1.7.1