From faa40222f2e15b68a89d2180b57d444de5b67709 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 31 五月 2021 13:18:11 +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/EventMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
index cc907f5..49043f9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventDTO;
+import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO;
import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
import com.panzhihua.service_grid.model.dos.EventDO;
import com.panzhihua.common.model.vos.grid.EventVO;
@@ -25,7 +26,7 @@
public interface EventMapper extends BaseMapper<EventDO> {
/**
- * 分页查询
+ * 分页查询事件
*
* @param pageEventDTO
* @return
@@ -33,6 +34,13 @@
IPage<EventVO> findByPage(Page page, @Param("pageEventDTO") PageEventDTO pageEventDTO);
/**
+ * 分页查询宣传教育
+ *
+ * @param pagePublicityEventDTO
+ * @return
+ */
+ IPage<EventVO> findPublicityByPage(Page page, @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO);
+ /**
* 地图模块-根据网格id查询网格办件事件
* @param gridId 网格id
* @return 网格办件事件
--
Gitblit v1.7.1