From b618786e735dcfcb8c929e7e1239f06f00634a38 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 四月 2021 14:08:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
index bc5b7d5..350c21a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -1,6 +1,7 @@
 package com.panzhihua.service_community.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
@@ -14,9 +15,16 @@
 
     /**
      * 分页查询邻里圈列表
-     * @param neighborCircleAppDTO  请求参数
-     * @return  邻里圈列表
+     *
+     * @param neighborCircleAppDTO 请求参数
+     * @return 邻里圈列表
      */
     R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO);
 
+    /**
+     * 管理后台查询邻里圈列表
+     * @return
+     */
+    //R backstagePageNeighbor(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+
 }

--
Gitblit v1.7.1