From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 45652ce..5c30185 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
@@ -81,5 +81,14 @@
     @ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
     @TableField("lease_status")
     private Integer leaseStatus;
+    @ApiModelProperty(value = "楼栋")
+    @TableField("building")
+    private String building;
+    @ApiModelProperty(value = "房号")
+    @TableField("room_number")
+    private String roomNumber;
 
+    @ApiModelProperty(value = "住户类型 1月租 2季租 3年租")
+    @TableField(exist = false)
+    private Integer tenantType;
 }

--
Gitblit v1.7.1