From 3fd5bd656683c482141b13cfdb953d17ba377f1f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 07 十一月 2025 09:50:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into hckx
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index baba550..20c9e8f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -18,7 +18,7 @@
* 鏃ユ湡
*/
@ApiModelProperty("鏃ユ湡")
- @Excel(name = "鏃ユ湡")
+ @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date date;
/**
--
Gitblit v1.9.3