From 0ddea65ff88b3b750ff14d9deb51fa0cda8e52a1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 五月 2025 15:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index c9735d8..64938d0 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -55,8 +55,8 @@
/** 瀵嗙爜 */
private String password;
- /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ /** 璐﹀彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ @Excel(name = "璐﹀彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
@@ -88,6 +88,9 @@
/** 瑙掕壊ID */
private Long roleId;
+
+ /** 绉熸埛ID */
+ private Integer tenantId;
public SysUser()
{
@@ -297,6 +300,14 @@
this.roleId = roleId;
}
+ public Integer getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Integer tenantId) {
+ this.tenantId = tenantId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3