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/HouseVO.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
new file mode 100644
index 0000000..a12cadc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
@@ -0,0 +1,52 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "历史租户列表VO")
+public class HouseVO {
+
+
+ @ApiModelProperty(value = "房屋id")
+ private String houseId;
+ @ApiModelProperty(value = "房屋id")
+ private String tenantId;
+
+ @ApiModelProperty(value = "租户姓名")
+ private String residentName;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "属性")
+ private String tenantAttributes;
+ @ApiModelProperty(value = "类型")
+ private String productType;
+ @ApiModelProperty(value = "类型")
+ private String tenantType;
+ @ApiModelProperty(value = "入住日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private LocalDateTime startTime;
+ @ApiModelProperty(value = "楼栋")
+ private String building;
+ @ApiModelProperty(value = "房号")
+ private String roomNumber;
+ @ApiModelProperty(value = "建筑面积")
+ private String houseArea;
+ @ApiModelProperty(value = "登录账号")
+ private String loginAccount;
+ @ApiModelProperty(value = "证件号码")
+ private String idCard;
+ @ApiModelProperty(value = "银行转账专号")
+ private String bankNumber;
+ @ApiModelProperty(value = "通讯地址")
+ private String mailAddress;
+}
--
Gitblit v1.7.1