From 34fcf32a24d06befd53c6e05ae9c41a4de24e71b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 10:00:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 7 +++----
1 files changed, 3 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 fecac9c..b335f3b 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,12 +84,11 @@
* 查询便民服务商家详情
*
* @param id 商家主键
- * @param cityCode 城市编码
* @return 返回结果
*/
@GetMapping("/business/get")
- public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
- return comCvtBusinessService.getComCvtBusiness(id, cityCode);
+ public R getComCvtBusiness(@RequestParam("id") Long id) {
+ return comCvtBusinessService.getComCvtBusiness(id);
}
/**
@@ -238,7 +237,7 @@
* @param list 服务集合
*/
@PostMapping("/serve/import")
- public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam("communityId") Long communityId){
+ public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam(value = "communityId",required = false) Long communityId){
return comCvtServeService.listSaveConvenientServeExcelVO(list,communityId);
}
}
--
Gitblit v1.7.1