From bd1e1c6a99c228ece8ece17be462b81d5494c7a1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 21:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java
index d8086c5..f99a415 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/EnergyStorageDischargeVO.java
@@ -8,9 +8,9 @@
@Data
public class EnergyStorageDischargeVO {
@ApiModelProperty("储能配置")
- private Integer config=100;
+ private Integer config=115;
@ApiModelProperty("今日储能")
- private Integer todayStorage=100;
+ private BigDecimal todayStorage;
@ApiModelProperty("今日放能")
private BigDecimal todayDischarge;
--
Gitblit v1.7.1