From 8568fc09c464606bd96bcc74c2c58faae99803b7 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 10 四月 2025 14:47:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenRentIncomeTrendVO.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenRentIncomeTrendVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenRentIncomeTrendVO.java index bfda473..1f01605 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenRentIncomeTrendVO.java +++ b/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; } -- Gitblit v1.7.1