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

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
index 1c9af7b..92a1d88 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
@@ -55,7 +55,7 @@
 
     @ApiModelProperty(value = "租户类型")
     @TableField("tenant_type")
-    private Integer tenantType;
+    private String tenantType;
 
     @ApiModelProperty(value = "联系电话")
     @NotBlank(message = "联系电话不能为空")

--
Gitblit v1.7.1