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/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 02f3811..fecac9c 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
@@ -84,11 +84,12 @@
* 查询便民服务商家详情
*
* @param id 商家主键
+ * @param cityCode 城市编码
* @return 返回结果
*/
@GetMapping("/business/get")
- public R getComCvtBusiness(@RequestParam("id") Long id) {
- return comCvtBusinessService.getComCvtBusiness(id);
+ public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
+ return comCvtBusinessService.getComCvtBusiness(id, cityCode);
}
/**
--
Gitblit v1.7.1