From b2a64967d13f68175cd0c47f1a5b6169c42ed8a9 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 16:21:30 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 15 +++++++++++++--
1 files changed, 13 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 cd8fffa..4a0186f 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
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -1463,7 +1464,17 @@
* 三说会堂后台重置密码
* */
@GetMapping("/sanshuoResetPassword")
- public R sanshuoAddUser(@RequestParam("id") Long userId,@RequestParam("pass")String password){
- return userService.resetPassExpertOrIndustryCenter(userId,password);
+ 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);
+ }
+
+ @PostMapping("/addComPbCheckUser")
+ public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){
+ return userService.addComPbCheckUser(comPbCheckUserDTO);
}
}
--
Gitblit v1.7.1