From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/TBillDto.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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 6a76c57..1babbce 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,11 @@
package com.ruoyi.system.dto;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TBillConfirm;
+import com.ruoyi.system.model.TBillDetail;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -12,9 +15,35 @@
private String phone;
+ private String email;
+
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;
+ /**
+ * 线下打款确认单
+ */
+ private TBillConfirm confirm;
}
--
Gitblit v1.7.1