From a429d8ffa31825c7cca7e005bc9ce8f85c15f1f6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 21 六月 2021 13:26:11 +0800
Subject: [PATCH] 代码合并

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index ca755fe..4cb1b8f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.service.grid;
 
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
 import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.grid.*;
@@ -892,4 +893,12 @@
      */
     @PostMapping("/eventgridmemberwarnlog/judge")
     R timedTaskGridMember();
+
+    /**
+     * 事件大屏查询事件列表
+     * @param eventListDTO  请求参数
+     * @return  事件列表
+     */
+    @PostMapping("/screen/event/list")
+    R getScreenEventList(@RequestBody ScreenEventListDTO eventListDTO);
 }

--
Gitblit v1.7.1