From dea02f2b19f2558acddca07fcd47e7154282c520 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 一月 2025 11:36:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/THouse.java |    5 +++--
 1 files changed, 3 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 9655c8e..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
@@ -87,7 +87,8 @@
     @ApiModelProperty(value = "房号")
     @TableField("room_number")
     private String roomNumber;
-    @ApiModelProperty(value = "租户类型 1月付 2季付 3年付")
+
+    @ApiModelProperty(value = "住户类型 1月租 2季租 3年租")
     @TableField(exist = false)
-    private String tenantType;
+    private Integer tenantType;
 }

--
Gitblit v1.7.1