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

xuhy

2025-06-09 f18b35727a11a5f8b5e326f6045f49b571954ba3

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

@@ -10,7 +10,7 @@
    @ApiModelProperty("储能配置")
    private Integer config=115;
    @ApiModelProperty("今日储能")
    private Integer todayStorage=230;
    private BigDecimal todayStorage;
    @ApiModelProperty("今日放能")
    private BigDecimal todayDischarge;