From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
index eafa629..d82bc16 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
@@ -21,6 +21,9 @@
@ApiModelProperty(value = "id")
private Long id;
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
+
@ApiModelProperty(value = "服务单号")
private String orderSn;
@@ -42,6 +45,9 @@
@ApiModelProperty(value = "网格员名字")
private String gridMemberName;
+ @ApiModelProperty(value = "网格员头像url")
+ private String gridMemberImageUrl;
+
@ApiModelProperty(value = "网格员联系方式")
private String gridMemberTelephone;
@@ -49,7 +55,7 @@
private String eventTitle;
@ApiModelProperty(value = "宣传类型")
- private Integer propagandaType;
+ private String propagandaType;
@ApiModelProperty(value = "宣传时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -74,7 +80,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date happenTime;
- @ApiModelProperty(value = "发生地点")
+ @ApiModelProperty(value = "事件发生地点备注")
private String happentAddress;
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
@@ -82,6 +88,9 @@
@ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）")
private Integer eventStatus;
+
+ @ApiModelProperty(value = "事件类型")
+ private String eventClazz;
@ApiModelProperty(value = "1待处理2已解决3待验证")
private Integer eventProcessStatus;
@@ -105,6 +114,9 @@
@ApiModelProperty(value = "事件来源")
private String eventResource;
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
+
@ApiModelProperty(value = "危险级别")
private Integer dangerLevel;
--
Gitblit v1.7.1