From e5cb65e56ca20f10aa581edfd26e13a114b590f4 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:16:44 +0800
Subject: [PATCH] 合并了一个方法

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..c83430f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEquipment.java
@@ -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