From a0400e48a2e8f50c457e1c4d4ba19bab2a0d1301 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 02 四月 2026 08:58:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java b/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
index ce29efc..09f8a21 100644
--- a/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
+++ b/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
@@ -26,4 +26,10 @@
//鑳借�楀満鏅�(鍔炲叕/鐢熶骇)
private String type;
+
+ //鑳借�楃被鍨�(姘�/鐢�/姘�)
+ private String energyName;
+
+ //鏃�/鏈�/骞�
+ private String state;
}
--
Gitblit v1.9.3