From a5255613206a8f9307b825f5ab32c41eb42ef169 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 10 六月 2021 13:23:30 +0800
Subject: [PATCH] 代码合并以及问题修复
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
index 2de6de8..f133538 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.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,9 +22,11 @@
public class EventTransferRecordVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "事件ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long eventId;
@ApiModelProperty(value = "来源类型（1、网格员2、社区3、是街道）")
@@ -49,6 +54,15 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date processDate;
+ @ApiModelProperty(value = "处理人或社区")
+ private Long processBy;
+
+ @ApiModelProperty(value = "处理人名或社区名")
+ private String processByName;
+
+ @ApiModelProperty(value = "业务处理类型")
+ private Integer processType;
+
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
--
Gitblit v1.7.1