From bb6aeccaad6a7bdf842828d6fb11f3fb61be76eb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 28 三月 2026 15:08:56 +0800
Subject: [PATCH] 关于能耗的统计调整2.0

---
 src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
index e2a747e..f9f2a7d 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 @Data
-@ApiModel("鑳借�楁垚鏈牳绠�---鎸夋棩鏈堟眹鎬荤粺璁�")
+@ApiModel("鎴愭湰鏍哥畻---鑳借�楁垚鏈牳绠�")
 public class EnergyAccountDto {
 
     @ApiModelProperty("鎬昏兘鑰楁垚鏈�")
@@ -23,12 +23,9 @@
     @ApiModelProperty("骞冲潎鎴愭湰")
     private BigDecimal averageEnergyCost;
 
-    @ApiModelProperty("鑳借�楁垚鏈秼鍔�")
-    private List<EnergyAccountTypeDto> energyAccountTypeDtos;
-
     @ApiModelProperty("鑳借�楃被鍨嬫垚鏈崰姣�")
     private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;
 
     @ApiModelProperty("鑳借�楃被鍨嬫槑缁�")
-    private List<EnergyConsumptionDetailDto> energyConsumptionDetailDtoList;
+    private List<EnergyDetailDto> energyConsumptionDetailDtoList;
 }

--
Gitblit v1.9.3