From 7335fc82791bdc7f71aa4fe9765045b8d476e9cd Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 13 四月 2022 20:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 3df433d..d79aa0f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -208,6 +208,7 @@
     @GetMapping("topic/list")
     public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId
             ,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero
+            ,@RequestParam(value = "belongType",defaultValue = "1",required = false) Integer belongType
             ,@RequestParam(value = "name",defaultValue = "",required = false) String name) {
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
         if (loginUserInfo != null) {
@@ -216,7 +217,7 @@
         if(isZero == null){
             isZero = 2;
         }
-        return communityService.getNeighborTopicByApp(communityId,isZero,name);
+        return communityService.getNeighborTopicByApp(communityId,isZero,name,belongType);
     }
 
     @ApiOperation(value = "用户新增邻里圈话题")

--
Gitblit v1.7.1