From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
index daff928..b03c88c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -335,23 +335,22 @@
/**
* 小程序查询邻里圈话题列表
*
- * @param communityId
* 社区id
* @return 邻里圈话题列表
*/
@GetMapping("getNeighborTopicByApp")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType) {
- return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero,name,belongType);
+ public R getNeighborTopicByApp(@RequestParam("name") String name) {
+ return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
}
/**
- * 小程序-用户新增话题
- * @param circleTopicAppDTO 请求参数
- * @return 新增结果
+ * 删除话题
+ * @param id
+ * @return
*/
- @PostMapping("addNeighborTopicByApp")
- public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){
- return comActNeighborCircleTopicService.addNeighborTopicByApp(circleTopicAppDTO);
+ @GetMapping("deleteNeighborTopic")
+ public R deleteNeighborTopic(@RequestParam("id") Long id){
+ return comActNeighborCircleTopicService.delete(id);
}
/**
--
Gitblit v1.7.1