From e1c8c9d51f1c6e42c9868743f16fa8e52bb419cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 14 十月 2026 09:24:04 +0800
Subject: [PATCH] Merge branch '2.3' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.3
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/energyreport/vo/StorageDailyReportRow.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/energyreport/vo/StorageDailyReportRow.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/energyreport/vo/StorageDailyReportRow.java
index 924d36d..d3f5bbc 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/energyreport/vo/StorageDailyReportRow.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/energyreport/vo/StorageDailyReportRow.java
@@ -12,8 +12,8 @@
@ExcelProperty("电站ID") private String stationId;
@ExcelProperty("电站名称") private String stationName;
@ExcelProperty("日期") private LocalDate statDate;
- @ExcelProperty("当日电价") private BigDecimal price;
- @ExcelProperty("电价名称") private String priceName;
+/* @ExcelProperty("当日电价") private BigDecimal price;
+ @ExcelProperty("电价名称") private String priceName;*/
@ExcelProperty("总收益(元)") private BigDecimal income;
@ExcelProperty("总充电量(kWh)") private BigDecimal chargedEnergy;
@ExcelProperty("尖时段充电量(kWh)") private BigDecimal chargedEnergySharp;
--
Gitblit v1.7.1