From 607b2357c553af2e1965762ec665b036a83cdbda Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Thu, 26 Sep 2024 08:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 help/sql/{ddl_1.0.0.sql => 1ddl_1.0.0.sql}                      | 0
 help/sql/{dml_1.0.0.sql => 2dml_1.0.0.sql}                      | 0
 help/sql/{dml_1.0.1.sql => 3dml_1.0.1.sql}                      | 0
 .../carbon/peakvalley/service/impl/PeakValleyServiceImpl.java   | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename help/sql/{ddl_1.0.0.sql => 1ddl_1.0.0.sql} (100%)
 rename help/sql/{dml_1.0.0.sql => 2dml_1.0.0.sql} (100%)
 rename help/sql/{dml_1.0.1.sql => 3dml_1.0.1.sql} (100%)

diff --git a/help/sql/ddl_1.0.0.sql b/help/sql/1ddl_1.0.0.sql
similarity index 100%
rename from help/sql/ddl_1.0.0.sql
rename to help/sql/1ddl_1.0.0.sql
diff --git a/help/sql/dml_1.0.0.sql b/help/sql/2dml_1.0.0.sql
similarity index 100%
rename from help/sql/dml_1.0.0.sql
rename to help/sql/2dml_1.0.0.sql
diff --git a/help/sql/dml_1.0.1.sql b/help/sql/3dml_1.0.1.sql
similarity index 100%
rename from help/sql/dml_1.0.1.sql
rename to help/sql/3dml_1.0.1.sql
diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java
index 7dc3964..0c2f47f 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java
@@ -151,7 +151,7 @@ public class PeakValleyServiceImpl implements PeakValleyService {
         });
         //总量的集合
         PeakValleyPriceStatisticsInfo statisticsInfo = new PeakValleyPriceStatisticsInfo();
-        statisticsInfo.setAttrName("总用量");
+        statisticsInfo.setAttrName("总用"+result.getBaseName()+"量");
         statisticsInfo.setBaseName(result.getBaseName());
         statisticsInfo.setAttrCode(result.getBaseCode());
         statisticsInfo.setAllDosageRatio(BigDecimal.valueOf(100));