From 13ccebf29ce191cc97b1d584d4bf7aa6084ebce0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 23 六月 2021 14:39:50 +0800
Subject: [PATCH] 解决代码冲突
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
index b5fbcf3..e2d9c0c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -250,6 +250,13 @@
* @return 事件列表
*/
R getScreenEventList(ScreenEventListDTO eventListDTO);
+
+ /**
+ * 特殊人群上报-社区人口数据列表
+ * @param specialPopulationDTO 请求参数
+ * @return 社区人口数据列表
+ */
+ R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO);
/**
* description 获取所有未上传到浪潮平台的事件列表
*
--
Gitblit v1.7.1