From 90de589a0964981f05b1571e441110130f35f4b8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 18 二月 2022 11:01:59 +0800
Subject: [PATCH] Merge branch 'volunteer_lyq' into '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