From feb98a932adc9dab19fa538dbad743c63af0e621 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 19 七月 2022 17:24:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_zZ
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 4 ++--
1 files changed, 2 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 3a75988..c48b46b 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
@@ -1433,8 +1433,8 @@
}
@GetMapping("/communityList")
- public R getCommunityList(@RequestParam(value = "type") Integer type){
- return userService.getCommunityList(type);
+ public R getCommunityList(@RequestParam("name") String name, @RequestParam(value = "id",required = false) Long id){
+ return userService.getCommunityList(name,id);
}
}
--
Gitblit v1.7.1