From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:47:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

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

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
index 8867a1d..fdef2d3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
@@ -23,7 +23,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