From bbda2ee1af4e86d76f93e00386d77efb56c60d5f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 23 七月 2022 15:42:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
index 653a428..998fedc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
@@ -1,5 +1,8 @@
package com.panzhihua.common.model.vos.community.acid;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.AllArgsConstructor;
@@ -24,13 +27,14 @@
public class ComActAcidDangerMemberVO implements Serializable {
private static final long serialVersionUID = 889636932941876579L;
-
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
@@ -75,4 +79,39 @@
@ApiModelProperty(value = "当前处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
private Integer status;
+ @ApiModelProperty(value = "健康码颜色")
+ private String colorMark;
+
+ @ApiModelProperty(value = "核酸检测")
+ private String acidTest;
+
+ @ApiModelProperty(value = "排查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkTime;
+
+ @ApiModelProperty(value = "报备时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 绑定单位
+ */
+ @ApiModelProperty(value = "绑定单位")
+ private String relationName;
+
+ @ApiModelProperty(value = "定位地址")
+ private String realAddress;
+
+ @ApiModelProperty(value = "风险类别")
+ private String riskType;
+
+ @ApiModelProperty(value = "在攀居住地")
+ private String localCity;
+
}
--
Gitblit v1.7.1