From 1a21c37e2c41236c89e97a33e9da65c5fe7971b6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 01 六月 2022 18:11:08 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
index cb170d2..078d608 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java
@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.community.acid;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.net.URL;
import java.util.Date;
@@ -38,12 +38,15 @@
@ExcelProperty(value = "出发城市")
private String departureCity;
+ @ExcelProperty(value = "出发详细地址")
+ private String departureAddress;
+
/**
* 出发日期
*/
@ExcelProperty(value = "出发日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat("yyyy-MM-dd")
private Date departureDate;
/**
@@ -69,7 +72,7 @@
*/
@ExcelProperty(value = "到达日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat("yyyy-MM-dd")
private Date arriveDate;
/**
@@ -117,6 +120,12 @@
@ExcelProperty("48小时核酸截图")
private URL acidImage;
- @ExcelProperty("疫苗接种截图")
- private URL vaccinationImage;
+// @ExcelProperty("疫苗接种截图")
+// private URL vaccinationImage;
+
+ @ExcelProperty("交通工具")
+ private String transport;
+
+ @ExcelProperty("车次信息")
+ private String transportInfo;
}
--
Gitblit v1.7.1