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 | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 d907416..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
@@ -22,6 +22,7 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
@@ -757,7 +758,7 @@
*
* @return
*/
- @PostMapping("timedtaskactmicrowishall")
+ @PostMapping("timedtaskactmicrowish")
R timedTaskActMicroWishAll();
/**
@@ -1217,7 +1218,7 @@
* @return 返回结果
*/
@GetMapping("/convenient/business/get")
- R getComCvtBusiness(@RequestParam("id") Long id);
+ R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode);
/**
* 删除便民服务商家信息
@@ -2385,7 +2386,7 @@
* 邻里圈评论回复_基本详情
* @param id 参数
*/
- @PostMapping("/neighbor/detailNeighborCommentReply")
+ @GetMapping("/neighbor/detailNeighborCommentReply")
R detailNeighborCommentReply(@RequestParam("id") Long id);
/**
@@ -2410,4 +2411,20 @@
@PostMapping("/neighbor/neighborAddBrowseByApp")
R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
+
+ /**
+ * 邻里圈_添加
+ * @param addNeighborCircleAdminVO 参数
+ */
+ @PostMapping("/neighbor/addNeighborByAdmin")
+ R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);
+
+ /**
+ * 分页查询评论下所有回复
+ * @param commentReplyAppDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("/neighbor/neighborCommentReplyByApp")
+ R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+
}
--
Gitblit v1.7.1