From 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 17:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 ef768d0..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
@@ -45,6 +45,9 @@
@ApiModelProperty(value = "网格员名字")
private String gridMemberName;
+ @ApiModelProperty(value = "网格员头像url")
+ private String gridMemberImageUrl;
+
@ApiModelProperty(value = "网格员联系方式")
private String gridMemberTelephone;
@@ -77,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 = "发生的精度纬度信息（逗号隔开）")
@@ -85,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;
@@ -108,6 +114,9 @@
@ApiModelProperty(value = "事件来源")
private String eventResource;
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
+
@ApiModelProperty(value = "危险级别")
private Integer dangerLevel;
--
Gitblit v1.7.1