From 124a6178ae918de05886b52199b7755d4fa1ece3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
new file mode 100644
index 0000000..8a5bf97
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
@@ -0,0 +1,31 @@
+package com.ruoyi.energy.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("鑳借�楁垚鏈牳绠�---鎸夋棩鏈堟眹鎬荤粺璁�")
+public class EnergyAccountDto {
+
+ @ApiModelProperty("鎬昏兘鑰楁垚鏈�")
+ private BigDecimal totalEnergyCost;
+
+ @ApiModelProperty("鐢熶骇鑳借�楁垚鏈�")
+ private BigDecimal productEnergyCost;
+
+ @ApiModelProperty("鍔炲叕鑳借�楁垚鏈�")
+ private BigDecimal officeEnergyCost;
+
+ @ApiModelProperty("骞冲潎鎴愭湰")
+ private BigDecimal averageEnergyCost;
+
+ @ApiModelProperty("鑳借�楃被鍨嬫垚鏈崰姣�")
+ private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;
+
+ @ApiModelProperty("鑳借�楃被鍨嬫槑缁�")
+ private List<EnergyConsumptionDetailDto> energyConsumptionDetailDtoList;
+}
--
Gitblit v1.9.3