Merge remote-tracking branch 'origin/master' into master

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));