From df78e9074d62a146d68752d65a65baf8d6efa66f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 21 八月 2023 22:59:57 +0800
Subject: [PATCH] 652487

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

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
index 6d7e308..bca3e8f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
@@ -69,7 +69,7 @@
      * 瀹跺涵id
      */
     @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
-    private String familyId;
+    private Long familyId;
 
     private String url;
 
@@ -98,7 +98,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