From 98af2bbf6d7c1c821919fc2221c4181479cdc562 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 01 四月 2026 11:32:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java
index a84b10f..f3c49d5 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java
@@ -15,5 +15,7 @@
@ApiModelProperty("鑳借�楃被鍨嬪崰姣�")
private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;
+ @ApiModelProperty("鑳借�楀崟鑰楄秼鍔�")
+ private List<EnergyCostDto> energyCostDtos;
}
--
Gitblit v1.9.3