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

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ScreenStorageConfigVO.java

@@ -25,4 +25,14 @@
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate lastUpdated;

    /**
     * 储能放电情况 今日放能
     */
    private BigDecimal todayDischarge;

    /**
     * 储能放电情况 今日储能
     */
    private BigDecimal todayStorage;
}