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/ScreenTopStaticsDataVO.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenTopStaticsDataVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenTopStaticsDataVO.java
index 87cabfb..a76573d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenTopStaticsDataVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenTopStaticsDataVO.java
@@ -20,10 +20,10 @@
@ApiModelProperty("已出租面积")
private Double houseRentedArea;
- @ApiModelProperty("总计应收租金")
+ @ApiModelProperty("总计应收租金（万元）")
private BigDecimal totalReceivableRent;
- @ApiModelProperty("总计已收租金")
+ @ApiModelProperty("总计已收租金（万元）")
private BigDecimal totalReceivedRent;
@ApiModelProperty("本月新增租户数")
@@ -32,10 +32,16 @@
@ApiModelProperty("总计租户数")
private Integer totalTenantCount;
- @ApiModelProperty("本季度已交租金")
+ @ApiModelProperty("本季度已交租金（万元）")
private BigDecimal totalRentPaid;
- @ApiModelProperty("本季度应交租金")
+ @ApiModelProperty("本季度应交租金（万元）")
private BigDecimal totalRentShould;
+
+ @ApiModelProperty("本季度欠费（万元）")
+ private BigDecimal totalRentOwe;
+
+ @ApiModelProperty("总计欠费（万元）")
+ private BigDecimal totalRentOweAll;
}
--
Gitblit v1.7.1