From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordExcelVO.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 054d20a..40734ba 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
@@ -2,8 +2,10 @@
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.net.URL;
 import java.util.Date;
 
 /**
@@ -102,4 +104,16 @@
      */
     @ExcelProperty(value = "48小时内核酸检测")
     private String acidTest;
+
+    @ExcelProperty("健康码截图")
+    private URL colorImage;
+
+    @ExcelProperty("行程码截图")
+    private URL travelImage;
+
+    @ExcelProperty("48小时核酸截图")
+    private URL acidImage;
+
+    @ExcelProperty("疫苗接种截图")
+    private URL vaccinationImage;
 }

--
Gitblit v1.7.1