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

xuhy

2025-06-09 f18b35727a11a5f8b5e326f6045f49b571954ba3

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

@@ -8,7 +8,7 @@
@Data
public class EmissionReductionVO {
    @ApiModelProperty("累计光伏发电二氧化碳减排量（吨）")
    private BigDecimal photovoltaic = new BigDecimal("63.00");
    private BigDecimal photovoltaic = new BigDecimal("1.39");
    @ApiModelProperty("累计光伏发电二氧化碳减排量（占比率）")
    private BigDecimal photovoltaicRate ;