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

xuhy

昨天 6ecf7171775a04bbcb52c9943bcafce699c837a7

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

@@ -12,7 +12,7 @@
    @ApiModelProperty("汽车放电量")
    private BigDecimal carDisCharge;
    @ApiModelProperty("光伏发电量")
    private BigDecimal photovoltaic=new BigDecimal("9950");
    private BigDecimal photovoltaic;
    @ApiModelProperty("光伏用电量")
    private BigDecimal greenElectricity;
    @ApiModelProperty("储能充电量")