From 823b3791ea60888168b277110cfce607e5eed3e4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 二月 2025 17:50:41 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/TBillDto.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TBillDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TBillDto.java
index 45c2e41..6619889 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TBillDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TBillDto.java
@@ -1,8 +1,10 @@
package com.ruoyi.system.dto;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TBillDetail;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -17,6 +19,26 @@
private String account;
private String houseName;
+ /**
+ * 合同信息
+ */
+ private String contractName;
+ private String partyTwoName;
+
+ private BigDecimal totalYear;
+
+ private String payType;
+
+ private BigDecimal deposit;
+
+ /**
+ * 水费
+ */
+ private TBillDetail water;
+ /**
+ * 电费
+ */
+ private TBillDetail elect;
}
--
Gitblit v1.7.1