From f471925b9c18e816c070cbf4a9c581c8cadfeff5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 16:20:57 +0800
Subject: [PATCH] Merge branch 'four_member' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java
index 82970e6..ae31c98 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java
@@ -1,15 +1,16 @@
package com.panzhihua.common.model.vos.community.screen.event;
+import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
@Data
@ApiModel("事件列表返回参数")
@@ -62,7 +63,19 @@
@ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
private Integer eventDealStatus;
- @ApiModelProperty("事件发生地点")
- private String propagandaType;
+ @ApiModelProperty("事件类型")
+ private String eventClazz;
+
+ @ApiModelProperty("发生区域")
+ private String gridName;
+
+ @ApiModelProperty(value = "音频")
+ private List<EventResourceVO> audios;
+
+ @ApiModelProperty(value = "视频")
+ private List<EventResourceVO> videos;
+
+ @ApiModelProperty(value = "图片")
+ private List<EventResourceVO> pics;
}
--
Gitblit v1.7.1