From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

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

diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
index f4f5ee9..e6ab3e7 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
@@ -9,7 +9,7 @@
 import java.util.Map;
 
 @Data
-@ApiModel("鑳借�楃粺璁�---鎸夋棩鏈堝勾姹囨�荤粺璁＄殑鑳借�楁暟鎹�")
+@ApiModel("鑳借�楃鐞�---鑳借�楃粺璁�")
 public class EnergyStatisticsDto {
 
     @ApiModelProperty("鎬昏�楃敤閲�")

--
Gitblit v1.9.3