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

mitao

2025-04-03 e1cb4c48186a8b916bedd56c9bbc127febe6ee62

 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;
}