From ce7f72ff0a44cb6e980b05a538a0339439248b99 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 17 十二月 2024 16:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 84549eb..798c117 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -116,12 +116,14 @@
* 角色类型 1=平台 2=公司 3=门店 4=修理厂
*/
@ApiModelProperty(value = "角色类型 1=平台 2=门店")
+ @TableField("role_type")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date passWordUpdate;
@ApiModelProperty(value = "对象ID")
+ @TableField("objectId")
private Integer objectId;
@ApiModelProperty(value = "备注")
@@ -401,7 +403,11 @@
public void setForbiddenRemark(String forbiddenRemark) {
this.forbiddenRemark = forbiddenRemark;
}
-
+
+ public List<String> getRoleNames() {
+ return roleNames;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.7.1