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

yupeng

2025-03-26 d1cc113ac2ce39f6a06ab0a838ccf538766580c2

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenRentIncomeTrendVO.java

@@ -18,6 +18,9 @@
    @ApiModelProperty("x轴 时间列表")
    private List<String> quarters;

    @ApiModelProperty("y轴 收入列表")
    @ApiModelProperty("y轴 收入列表（万元）")
    private List<BigDecimal> incomeData;

    @ApiModelProperty("y轴 欠费列表（万元）")
    private List<BigDecimal> outstandingData;
}