From 35f7901210de45eefaa58b38db23405c561f9484 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 22 八月 2025 11:29:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 945b3ae..b1e7937 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -64,13 +64,13 @@
/**
* 澶村儚
*/
- @Excel(name = "澶村儚", width = 15,type = 2)
+// @Excel(name = "澶村儚", width = 15,type = 2)
private String avatar;
/**
* 鐢熸棩
*/
- @Excel(name = "鐢熸棩", width = 15, format = "yyyy-MM-dd")
+// @Excel(name = "鐢熸棩", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@@ -78,14 +78,14 @@
/**
* 鎬у埆锛�1锛氱敺 2锛氬コ锛�
*/
- @Excel(name = "鎬у埆", width = 15,dicCode="sex")
+// @Excel(name = "鎬у埆", width = 15,dicCode="sex")
@Dict(dicCode = "sex")
private Integer sex;
/**
* 鐢靛瓙閭欢
*/
- @Excel(name = "鐢靛瓙閭欢", width = 15)
+// @Excel(name = "鐢靛瓙閭欢", width = 15)
private String email;
/**
@@ -115,7 +115,7 @@
/**
* 鍒犻櫎鐘舵�侊紙0锛屾甯革紝1宸插垹闄わ級
*/
- @Excel(name = "鍒犻櫎鐘舵��", width = 15,dicCode="del_flag")
+// @Excel(name = "鍒犻櫎鐘舵��", width = 15,dicCode="del_flag")
@TableLogic
private Integer delFlag;
@@ -128,14 +128,14 @@
/**
* 鑱屽姟锛屽叧鑱旇亴鍔¤〃
*/
- @Excel(name = "鑱屽姟", width = 15)
+ @Excel(name = "宀椾綅", width = 15)
@Dict(dictTable ="sys_position",dicText = "name",dicCode = "code")
private String post;
/**
* 搴ф満鍙�
*/
- @Excel(name = "搴ф満鍙�", width = 15)
+// @Excel(name = "搴ф満鍙�", width = 15)
private String telephone;
/**
@@ -165,30 +165,38 @@
/**
* 韬唤锛�0 鏅�氭垚鍛� 1 涓婄骇锛�
*/
- @Excel(name="锛�1鏅�氭垚鍛� 2涓婄骇锛�",width = 15)
+// @Excel(name="锛�1鏅�氭垚鍛� 2涓婄骇锛�",width = 15)
private Integer userIdentity;
/**
* 鐢ㄦ埛绫诲瀷锛�1 鏅�氭垚鍛� 2 宸ユ 3 杞﹂棿 4 鍏徃锛�
*/
- @Excel(name="锛�1鏅�氭垚鍛� 2宸ユ 3杞﹂棿 4鍏徃锛�",width = 15)
+// @Excel(name="锛�1鏅�氭垚鍛� 2宸ユ 3杞﹂棿 4鍏徃锛�",width = 15)
private Integer userType;
/**
* 璐熻矗閮ㄩ棬
*/
- @Excel(name="璐熻矗閮ㄩ棬",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
+// @Excel(name="璐熻矗閮ㄩ棬",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private String departIds;
/**
* 璐熻矗浜х嚎
*/
- @Excel(name="璐熻矗浜х嚎",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
+ @Excel(name="杞﹂棿鍒嗛厤",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
@Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
private String productionIds;
/**
+ * 瑙掕壊鍒嗛厤 (瀵煎叆瀵煎嚭浣跨敤)
+ */
+ @Excel(name="瑙掕壊鍒嗛厤",width = 15,dictTable ="sys_role",dicText = "role_name",dicCode = "id")
+ @Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id")
+ @TableField(exist = false)
+ private String roleIds;
+
+ /**
* 澶氱鎴穒d閰嶇疆锛岀紪杈戠敤鎴风殑鏃跺�欒缃�
*/
private String relTenantIds;
--
Gitblit v1.9.3