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

xuhy

15 小时以前 6ecf7171775a04bbcb52c9943bcafce699c837a7

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

@@ -14,7 +14,7 @@
    @ApiModelProperty("装机容量")
    private BigDecimal capacity = new BigDecimal("759.52");
    @ApiModelProperty("今日已发电")
    private BigDecimal todayGenerateElectricity=new BigDecimal("71.29");
    private BigDecimal todayGenerateElectricity=new BigDecimal("0");

    @ApiModelProperty("今日绿电消纳值")
    private BigDecimal greenElectricityToday=new BigDecimal("0.00");