From 83f6a929a4a9ee2f67cfa6dd7d059c998380141d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 17:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
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