From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
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