From b2be113822cad796a1489b7fc52de2cb4042b57c Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期二, 18 二月 2025 12:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xizang-changyun' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..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;
@@ -90,5 +90,5 @@
@ApiModelProperty(value = "住户类型 1月租 2季租 3年租")
@TableField(exist = false)
- private Integer tenantType;
+ private String tenantType;
}
--
Gitblit v1.7.1