From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
index 13c2581..e096c7a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleTopicService.java
@@ -4,7 +4,6 @@
 import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
 import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
 
@@ -45,11 +44,10 @@
     /**
      * 小程序查询邻里圈话题列表
      *
-     * @param communityId
      *            社区id
      * @return 邻里圈话题列表
      */
-    R getNeighborTopicByApp(Long communityId,Integer isZero,String name,Integer belongType);
+    R getNeighborTopicByApp(String name);
 
     /**
      * 小程序-用户新增话题
@@ -58,4 +56,10 @@
      */
     R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO);
 
+    /**
+     * 删除话题
+     * @param id
+     * @return
+     */
+    R delete(Long id);
 }

--
Gitblit v1.7.1