From 51508c8c63bb072739a0e3ae45cb11e7599c8f66 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 20 八月 2021 10:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java
index f934b3a..b46b013 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java
@@ -5,6 +5,7 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.util.List;
@Data
@ApiModel("大屏事件列表请求参数")
@@ -27,10 +28,10 @@
private String endTime;
@ApiModelProperty(value="网格id")
- private Long gridId;
+ private List<Long> gridIds;
@ApiModelProperty(value="事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育）")
- private Integer eventType;
+ private List<Integer> eventTypes;
@ApiModelProperty(value="事件分类(1、办件事件2、宣传事件3、阅读事件)",hidden = true)
private Integer eventCategory = 1;
--
Gitblit v1.7.1