From fe7fa03c8f6047fe32c8477c0d3548d8f30e151d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 三月 2025 14:01:36 +0800
Subject: [PATCH] Merge branch 'dev' into dev_dz
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 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..e15ec7f 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
@@ -37,6 +37,9 @@
@Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
+ /** 鑻辨枃鍚嶇О */
+ private String nameEn;
+
/** 鐢ㄦ埛閭 */
@Excel(name = "鐢ㄦ埛閭")
private String email;
@@ -51,6 +54,15 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
+
+ /** 绛惧悕鍦板潃 */
+ private String signatureUrl;
+
+ /** 涓汉鐓х墖鍦板潃 */
+ private String pictureUrl;
+
+ /** 鍗曚綅id */
+ private String company;
/** 瀵嗙爜 */
private String password;
@@ -297,6 +309,46 @@
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
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.3