From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 ce8de0a..e179c8a 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
@@ -340,8 +340,28 @@
      * @return 邻里圈话题列表
      */
     @GetMapping("getNeighborTopicByApp")
-    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
-        return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId);
+    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name) {
+        return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId,isZero,name);
+    }
+
+    /**
+     * 小程序-用户新增话题
+     * @param circleTopicAppDTO 请求参数
+     * @return  新增结果
+     */
+    @PostMapping("addNeighborTopicByApp")
+    public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO){
+        return comActNeighborCircleTopicService.addNeighborTopicByApp(circleTopicAppDTO);
+    }
+
+    /**
+     * 小程序-删除邻里圈
+     * @param circleTopicAppDTO 请求参数
+     * @return  删除结果
+     */
+    @PostMapping("deleteNeighborByApp")
+    public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO){
+        return comActNeighborCircleService.deleteNeighborByApp(circleTopicAppDTO);
     }
 
 }

--
Gitblit v1.7.1