From eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 09:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
index 48584b3..85a5178 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
@@ -33,13 +33,6 @@
     R edit(EventGridDataEditDTO eventGridDataEditDTO);
 
     /**
-     * 分页查找区县/街道/社区/网格员网格数据管理
-     * @param pageEventGridDataDTO
-     * @return 维护结果
-     */
-    R<IPage<EventGridDataVO>> query(PageEventGridDataDTO pageEventGridDataDTO);
-
-    /**
      * 删除区县/街道/社区/网格员网格数据管理
      * @param EventGridDataDeleteDTO
      * @return 平台用户信息
@@ -74,4 +67,18 @@
      * @return
      */
     R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO);
+
+    /**
+     * 分页查询网格
+     * @param eventGridDataDTO  请求参数
+     * @return  网格列表
+     */
+    R getGridMemberList(PageEventGridDataDTO eventGridDataDTO);
+
+    /**
+     * 查询社区下所有网格员
+     * @param communityId   社区id
+     * @return  网格员列表
+     */
+    R getGridMemberLists(Long communityId);
 }

--
Gitblit v1.7.1