From def06893b9706ac62cd56ad9da989f688f94cb64 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 06 四月 2023 22:17:17 +0800
Subject: [PATCH] 8888

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
index 18f386c..5cf7cad 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
@@ -6,6 +6,8 @@
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -51,10 +53,19 @@
     @Excel(name="澶囨敞")
     private String remark;
 
-    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name="鍒涘缓鏃堕棿")
-    private LocalDateTime createTime;
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
+    private Date createTime;
 
     private String url;
 
+    /**
+     * 瀹跺涵id
+     */
+    @Excel(name="瀹跺涵缂栧彿")
+    private String familyId;
+
 }

--
Gitblit v1.9.1