From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index 0c4c4c4..72a50a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -433,8 +433,8 @@
      * @return
      */
     @GetMapping("/service-category/all")
-    public R getAllServiceCategories() {
-        return convenientServiceCategoryService.getAllServiceCategories();
+    public R getAllServiceCategories(@RequestParam("areaCode") String areaCode) {
+        return convenientServiceCategoryService.getAllServiceCategories(areaCode);
     }
 
     /**
@@ -584,8 +584,8 @@
      * @return
      */
     @GetMapping("/service-category/suitable")
-    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId) {
-        return convenientServiceCategoryService.getSuitableServiceCategories(communityId);
+    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode) {
+        return convenientServiceCategoryService.getSuitableServiceCategories(communityId,areaCode);
     }
 
     /**

--
Gitblit v1.7.1