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/EventDetailsVO.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
index 9e0a2d1..991a1ce 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -21,8 +21,14 @@
@ApiModelProperty(value = "id")
private Long id;
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
+
@ApiModelProperty(value = "服务单号")
private String orderSn;
+
+ @ApiModelProperty(value = "事件类型")
+ private String EventClazz;
@ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件")
private Long eventCategory;
@@ -36,11 +42,17 @@
@ApiModelProperty(value = "网格ID")
private Long gridId;
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
@ApiModelProperty(value = "网格员")
private Long gridMemberId;
@ApiModelProperty(value = "网格员名字")
private String gridMemberName;
+
+ @ApiModelProperty(value = "网格员头像")
+ private String gridMemberImageUrl;
@ApiModelProperty(value = "网格员联系方式")
private String gridMemberTelephone;
@@ -49,7 +61,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,8 +86,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date happenTime;
- @ApiModelProperty(value = "发生地点")
+ @ApiModelProperty(value = "事件发生地点备注")
private String happentAddress;
+
+ @ApiModelProperty(value = "事件发生地点")
+ private String happenAddress;
@ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）")
private String happentLatLng;
@@ -92,6 +107,9 @@
@ApiModelProperty(value = "处理人ID")
private Long processUserId;
+ @ApiModelProperty(value = "处理流程记录ID")
+ private Long processRecordId;
+
@ApiModelProperty(value = "处理人名称")
private String processUserName;
--
Gitblit v1.7.1