From 601e7ddfd4e8e6b51d12708c00783d13c7522e0e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 24 九月 2022 10:06:06 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
index 03d3e8b..55c7bbc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
@@ -1,6 +1,7 @@
 package com.panzhihua.common.model.dtos.community.acid;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -50,9 +51,18 @@
     private Long userId;
 
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startTime;
+    private String startTime;
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date stopTime;
+    private String stopTime;
+    @ApiModelProperty("健康码状态")
+    private String colorMark;
+    @ApiModelProperty("行程码")
+    private String travelCard;
+    @ApiModelProperty("核查状态")
+    private String checkStatus;
+    @ApiModelProperty("id数组")
+    private String ids;
+    @ApiModelProperty("登录的账号名")
+    private String loginAccount;
+    private Integer type;
 }

--
Gitblit v1.7.1