From 1e0fe96e56d9d6fa6153d4c7e512e129d922ca61 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 25 七月 2023 22:26:23 +0800
Subject: [PATCH] 45615

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
index 3a2530d..b4f7498 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
@@ -82,7 +82,7 @@
      * 鎵�灞炲搴璱d
      */
     @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
-    private String familyId;
+    private Long familyId;
 
     /**
      * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
@@ -111,7 +111,7 @@
     /**
      * 鑾峰緱鏃堕棿
      */
-    @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "鑾峰緱鏃堕棿", dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date happenTime;
 

--
Gitblit v1.9.1