From 55427247b31582f5b6eda25dc811c48d3f9809e8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 17:41:38 +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/dao/EventGridDataMapper.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
index db04fae..0dd5f21 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
@@ -7,6 +7,7 @@
 import com.panzhihua.common.model.dtos.grid.EventGridTodoDataDTO;
 import com.panzhihua.common.model.dtos.grid.PageEventGridDataAdminDTO;
 import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.PageEventGridNearbyDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.*;
 import com.panzhihua.service_grid.model.dos.EventGridDataDO;
@@ -64,4 +65,6 @@
     List<EventGridMemberAdminVO> getGridMemberListsByGrid(@Param("gridId") Long gridId);
 
     List<EventGridDataAreaVO> getGridDataListByCommunity(@Param("communityId") Long communityId);
+
+    List<EventGridDataAreaVO> selectGridWithArea(Page page, PageEventGridNearbyDTO pageEventGridNearbyDTO);
 }

--
Gitblit v1.7.1