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

xuhy

昨天 6ecf7171775a04bbcb52c9943bcafce699c837a7

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