From e37e7842a5019c64af9213fb763ea322530ac704 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 08 五月 2021 14:24:31 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 e4339a4..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
@@ -758,7 +758,7 @@
*
* @return
*/
- @PostMapping("timedtaskactmicrowishall")
+ @PostMapping("timedtaskactmicrowish")
R timedTaskActMicroWishAll();
/**
@@ -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