From ee34e4d0c3b50d20854db4e76e7aa130d758d4f3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 12 二月 2025 09:49:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java
index cee3da4..6b4bbbe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java
@@ -1,10 +1,29 @@
package com.ruoyi.system.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TBillDetail;
+import com.ruoyi.system.model.THouse;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel(value = "缴费账单VO")
public class TBillVO extends TBill {
+
+ @ApiModelProperty(value = "水电费明细")
+ private List<TBillDetail> billDetailList;
+
+ @ApiModelProperty(value = "房屋信息")
+ private THouse house;
+
+ @ApiModelProperty(value = "租金")
+ private BigDecimal monthRent;
+
+ @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
+ private String payType;
}
--
Gitblit v1.7.1