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/MyHouseVO.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java
new file mode 100644
index 0000000..a591dbb
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java
@@ -0,0 +1,40 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.model.TBill;
+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
+@ApiModel(value = "我的在租VO")
+public class MyHouseVO {
+ @ApiModelProperty(value = "合同id")
+ private String id;
+ @ApiModelProperty(value = "地址")
+ private String houseAddress;
+ @ApiModelProperty(value = "月付租金")
+ private BigDecimal monthRent;
+ @ApiModelProperty(value = "支付方式 月付、季付、年付")
+ private String payType;
+ @ApiModelProperty(value = "付款当月月份")
+ private String month;
+ @ApiModelProperty(value = "建筑面积")
+ private String houseArea;
+ @ApiModelProperty(value = "户型")
+ private String houseType;
+ @ApiModelProperty(value = "结束时间")
+ private String endTime;
+ @ApiModelProperty(value = "开始时间")
+ private String startTime;
+ @ApiModelProperty(value = "房东")
+ private String propertyRightPerson;
+ @ApiModelProperty(value = "房东联系方式")
+ private String phone;
+ @ApiModelProperty(value = "交租记录")
+ private List<PayListVO> payList;
+}
--
Gitblit v1.7.1