From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 9 +++++----
1 files changed, 5 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 d3cd3b0..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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;
+import java.time.Instant;
import java.util.List;
import javax.annotation.Resource;
@@ -432,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);
}
/**
@@ -583,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