From 593d785f10bc554cdc8eddf23e5e324c0258adbb Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 01 七月 2025 17:58:42 +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 | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 baad351..f3c3246 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
@@ -169,6 +169,12 @@
private Integer userIdentity;
/**
+ * 鐢ㄦ埛绫诲瀷锛�1 鏅�氭垚鍛� 2 宸ユ 3 杞﹂棿 4 鍏徃锛�
+ */
+ @Excel(name="锛�1鏅�氭垚鍛� 2宸ユ 3杞﹂棿 4鍏徃锛�",width = 15)
+ private Integer userType;
+
+ /**
* 璐熻矗閮ㄩ棬
*/
@Excel(name="璐熻矗閮ㄩ棬",width = 15,dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
@@ -183,6 +189,13 @@
private String productionIds;
/**
+ * 璐熻矗缁翠慨閮ㄩ棬鐝粍
+ */
+ @Excel(name="璐熻矗缁翠慨閮ㄩ棬鐝粍",width = 15,dictTable ="eam_base_repair_depart",dicText = "depart_name",dicCode = "id")
+ @Dict(dictTable ="eam_base_repair_depart",dicText = "depart_name",dicCode = "id")
+ private String repairDepartIds;
+
+ /**
* 澶氱鎴穒d閰嶇疆锛岀紪杈戠敤鎴风殑鏃跺�欒缃�
*/
private String relTenantIds;
@@ -195,9 +208,9 @@
*/
@TableField(exist = false)
private String homePath;
- @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
+// @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
private String teamId;
- @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+// @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
private String areaId;
/**
--
Gitblit v1.9.3