From 6ecf7171775a04bbcb52c9943bcafce699c837a7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 11:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ScreenStorageConfigVO.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ScreenStorageConfigVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ScreenStorageConfigVO.java
index 5d3c27f..9e32b1f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ScreenStorageConfigVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ScreenStorageConfigVO.java
@@ -27,7 +27,12 @@
     private LocalDate lastUpdated;
 
     /**
-     * 储能放电情况 今日放能 规定时间内 随机增长 凌晨数值重置
+     * 储能放电情况 今日放能
      */
-    private BigDecimal currentValue;
+    private BigDecimal todayDischarge;
+
+    /**
+     * 储能放电情况 今日储能
+     */
+    private BigDecimal todayStorage;
 }

--
Gitblit v1.7.1