From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 14 ++++++++++++--
1 files changed, 12 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 da84237..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);
@@ -1508,8 +1513,13 @@
}
@GetMapping("/myFeedBack")
- public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type){
- return userService.myFeedBack(id,type);
+ 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