From 4e8338d3e2b30e360f028c9f2354462ca817a989 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 七月 2021 17:17:11 +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 d82bc16..d5f06d1 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
@@ -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 EventVO {
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "事件处理状态")
@@ -37,9 +41,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 = "网格员名字")
@@ -155,7 +164,7 @@
private Long createBy;
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty(value = "修改人")
--
Gitblit v1.7.1