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/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 007aadb..e32573a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1266,5 +1266,5 @@
     R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
 
     @GetMapping("/communityList")
-    R communityList(@RequestParam("type") Integer type);
+    R communityList(@RequestParam("name") String name, @RequestParam("id") Long  id);
 }

--
Gitblit v1.7.1