From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期三, 23 六月 2021 14:37:44 +0800 Subject: [PATCH] Merge branch 'test' into 'test_wangge_two' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventTransferRecordVO.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 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 b8b3676..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、是街道)") @@ -56,7 +61,7 @@ private String processByName; @ApiModelProperty(value = "业务处理类型") - private String processType; + private Integer processType; @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") -- Gitblit v1.7.1