From 2a212f983f35e1c569dfec3a172fb5f0c9f85fac Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 cd7ecb0..278d4b4 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
@@ -1457,6 +1457,11 @@
return userService.getCommunityList(name,id);
}
+ @GetMapping("/getAllCommunityList")
+ public R getAllCommunityList(){
+ return userService.getAllCommunityList();
+ }
+
@GetMapping("/resetPasswordAccount")
public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
return userService.resetPassword(type,account,appId);
@@ -1483,6 +1488,14 @@
return userService.resetPassExpertOrIndustryCenter(account,password);
}
+ /**
+ * 移除账号专家权限
+ *
+ */
+ @GetMapping("/removeExpertRole")
+ public R removeExpertRole(@RequestParam(value = "phone",required = false)String phone){
+ return userService.removeExpertRole(phone);
+ }
@GetMapping("/accept")
public R accept(@RequestParam("userId")Long userId){
@@ -1494,5 +1507,19 @@
return userService.addComPbCheckUser(comPbCheckUserDTO);
}
+ @PostMapping("/feedBackReply")
+ public R feedBackReply(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
+ return userService.feedBackReply(sysUserFeedbackVO);
+ }
+
+ @GetMapping("/myFeedBack")
+ public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type,@RequestParam("propertyId")Long propertyId){
+ return userService.myFeedBack(id,type,propertyId);
+ }
+
+ @GetMapping("/propertyCheck")
+ public R propertyCheck(@RequestParam String phone){
+ return userService.propertyCheck(phone);
+ }
}
--
Gitblit v1.7.1