From a6077615d835d96ded47f2d170e22ea88e9a3099 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 五月 2026 15:23:19 +0800
Subject: [PATCH] 不合格处理:对接OA报错问题修复
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 78 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d169139..61421ff 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -14,7 +14,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
public class SysUser extends BaseEntity
@@ -24,6 +24,9 @@
/** 鐢ㄦ埛ID */
@Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
private Long userId;
+
+ /** 鎺掑簭涓嬫爣 */
+ private Integer sort;
/** 閮ㄩ棬ID */
@Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
@@ -36,6 +39,9 @@
/** 鐢ㄦ埛鏄电О */
@Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
+
+ /** 鑻辨枃鍚嶇О */
+ private String nameEn;
/** 鐢ㄦ埛閭 */
@Excel(name = "鐢ㄦ埛閭")
@@ -52,6 +58,15 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
+ /** 绛惧悕鍦板潃 */
+ private String signatureUrl;
+
+ /** 涓汉鐓х墖鍦板潃 */
+ private String pictureUrl;
+
+ /** 鍗曚綅id */
+ private String company;
+
/** 瀵嗙爜 */
private String password;
@@ -61,6 +76,9 @@
/** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
private String delFlag;
+
+ /** 瑙掕壊鍚嶇О */
+ private String roleName;
/** 鏈�鍚庣櫥褰旾P */
@Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
@@ -107,6 +125,14 @@
public void setUserId(Long userId)
{
this.userId = userId;
+ }
+
+ public Integer getSort() {
+ return sort;
+ }
+
+ public void setSort(Integer sort) {
+ this.sort = sort;
}
public boolean isAdmin()
@@ -287,6 +313,15 @@
this.postIds = postIds;
}
+ public String getRoleName()
+ {
+ return roleName;
+ }
+
+ public void setRoleName(String roleName)
+ {
+ this.roleName = roleName;
+ }
public Long getRoleId()
{
return roleId;
@@ -295,6 +330,46 @@
public void setRoleId(Long roleId)
{
this.roleId = roleId;
+ }
+
+ public String getNameEn()
+ {
+ return nameEn;
+ }
+
+ public void setNameEn(String nameEn)
+ {
+ this.nameEn = nameEn;
+ }
+
+ public String getSignatureUrl()
+ {
+ return signatureUrl;
+ }
+
+ public void setSignatureUrl(String signatureUrl)
+ {
+ this.signatureUrl = signatureUrl;
+ }
+
+ public String getPictureUrl()
+ {
+ return pictureUrl;
+ }
+
+ public void setPictureUrl(String pictureUrl)
+ {
+ this.pictureUrl = pictureUrl;
+ }
+
+ public String getCompany()
+ {
+ return company;
+ }
+
+ public void setCompany(String company)
+ {
+ this.company = company;
}
@Override
@@ -319,6 +394,7 @@
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
+ .append("roleName", getRoleName())
.toString();
}
}
--
Gitblit v1.9.3