From d1cc113ac2ce39f6a06ab0a838ccf538766580c2 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期三, 26 三月 2025 17:52:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into xizang-changyun --- 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