From 8429b26635252973e325d020af1a4485a0bbfdb0 Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期三, 28 八月 2024 11:26:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java | 2 +- 1 files changed, 1 insertions(+), 1 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 7916f7e..be9d73a 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java @@ -62,7 +62,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