From 1ef187142b42b859ab20be4d9c75185a6f256751 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 29 四月 2021 13:24:17 +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 |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 7b5f0cb..d0590d5 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
@@ -6,6 +6,10 @@
 import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
 import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
 import com.panzhihua.common.model.dtos.shop.*;
 import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -2264,6 +2268,32 @@
     R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
 
     /**
+     * 管理后台查询邻里圈列表
+     * @param comActNeighborCircleAdminDTO  请求参数
+     * @return  邻里圈列表
+     */
+    @PostMapping("/neighbor/pageNeighborByAdmin")
+    R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+
+
+    /**
+     * 后台修改邻里圈
+     * @param comActNeighborCircleAdminDTO  请求参数
+     */
+    @PostMapping("/neighbor/changeStatusByAdmin")
+    R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+
+
+    /**
+     * 后台修改邻里圈
+     * @param id  邻里圈id
+     * @return  邻里圈列表
+     */
+    @PostMapping("/neighbor/deleteByAdmin")
+    R deleteByAdmin(@RequestParam("id")Long id);
+
+
+    /**
      * 用户查询邻里圈列表
      * @param neighborCircleAppDTO  请求参数
      * @return  邻里圈列表

--
Gitblit v1.7.1