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/model/THouse.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java
index 5c30185..9a03ab2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java
@@ -47,7 +47,7 @@
@ApiModelProperty(value = "建筑面积")
@TableField("house_area")
- private Integer houseArea;
+ private String houseArea;
@ApiModelProperty(value = "户型")
@TableField("house_type")
@@ -80,15 +80,18 @@
@ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
@TableField("lease_status")
- private Integer leaseStatus;
+ private String leaseStatus;
@ApiModelProperty(value = "楼栋")
@TableField("building")
private String building;
@ApiModelProperty(value = "房号")
@TableField("room_number")
private String roomNumber;
+ @ApiModelProperty(value = "产权人联系方式")
+ @TableField("phone")
+ private String phone;
@ApiModelProperty(value = "住户类型 1月租 2季租 3年租")
@TableField(exist = false)
- private Integer tenantType;
+ private String tenantType;
}
--
Gitblit v1.7.1