From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java | 20 ++++++++++++++++++--
1 files changed, 18 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 5d966cc..d234642 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
@@ -1,6 +1,9 @@
package com.panzhihua.common.model.vos.grid;
import java.util.*;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +22,7 @@
public class EventDetailsVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "事件处理状态")
@@ -40,12 +44,14 @@
private Long gridMemberCommunity;
@ApiModelProperty(value = "网格ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridId;
@ApiModelProperty(value = "网格名称")
private String gridName;
@ApiModelProperty(value = "网格员")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long gridMemberId;
@ApiModelProperty(value = "网格员名字")
@@ -86,8 +92,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;
@@ -103,6 +112,10 @@
@ApiModelProperty(value = "处理人ID")
private Long processUserId;
+
+ @ApiModelProperty(value = "处理流程记录ID")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long processRecordId;
@ApiModelProperty(value = "处理人名称")
private String processUserName;
@@ -151,9 +164,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitDate;
- @ApiModelProperty(value = "创建人")
+ @ApiModelProperty(value = "创建人id")
private Long createBy;
+ @ApiModelProperty(value = "创建人姓名")
+ private String creator;
+
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
--
Gitblit v1.7.1