From ac56d448846892223ec1107a9dc1bfbfa3464c71 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 08 五月 2021 13:15:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index f148c10..9504aed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1218,7 +1218,7 @@
      * @return 返回结果
      */
     @GetMapping("/convenient/business/get")
-    R getComCvtBusiness(@RequestParam("id") Long id);
+    R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode);
 
     /**
      * 删除便民服务商家信息

--
Gitblit v1.7.1