From 078ce36a32bc6679f32e42fd18a9cbb454ff7b7d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 11:38:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 ba521cd..50fd212 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
@@ -80,7 +80,7 @@
@ApiModelProperty(value = "租赁状态 1=待出租 2=已出租 3=维修中")
@TableField("lease_status")
- private Integer leaseStatus;
+ private String leaseStatus;
@ApiModelProperty(value = "楼栋")
@TableField("building")
private String building;
@@ -88,4 +88,7 @@
@TableField("room_number")
private String roomNumber;
+ @ApiModelProperty(value = "住户类型 1月租 2季租 3年租")
+ @TableField(exist = false)
+ private String tenantType;
}
--
Gitblit v1.7.1