From ca8c83c771495363c46b6cfe56a599dfbdbe70d2 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 07 三月 2025 14:23:34 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang --- 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