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/vo/TBillVO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 60ad80c..d45a85a 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,11 +1,16 @@
package com.ruoyi.system.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
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.time.LocalDateTime;
import java.util.List;
@Data
@@ -15,4 +20,26 @@
@ApiModelProperty(value = "水电费明细")
private List<TBillDetail> billDetailList;
+ @ApiModelProperty(value = "房屋信息")
+ private THouse house;
+
+ @ApiModelProperty(value = "租金")
+ private BigDecimal monthRent;
+
+ @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
+ private String payType;
+
+ @ApiModelProperty(value = "押金")
+ private BigDecimal deposit;
+ @ApiModelProperty(value = "甲方联系人")
+ private String partyOnePerson;
+
+ @ApiModelProperty(value = "甲方联系方式")
+ private String partyOnePhone;
+ @ApiModelProperty(value = "合同开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime concatStartTime;
+ @ApiModelProperty(value = "合同结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime concatEndTime;
}
--
Gitblit v1.7.1