From c82b14f3a882698cbca62ef168615d31711320ca Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:12:29 +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 | 14 ++++++++++++--
1 files changed, 12 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 f3c3246..76ac551 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
@@ -189,6 +189,18 @@
private String productionIds;
/**
+ * eam涓績鍒嗛厤
+ */
+ @Excel(name="eam涓績鍒嗛厤",width = 15,dictTable ="eam_base_factory",dicText = "factory_name",dicCode = "id")
+ @Dict(dictTable ="eam_base_factory",dicText = "factory_name",dicCode = "id")
+ private transient String eamFactoryIds;
+
+ /**
+ * eam璁惧缁�
+ */
+ private String eamEquipmentIds;
+
+ /**
* 璐熻矗缁翠慨閮ㄩ棬鐝粍
*/
@Excel(name="璐熻矗缁翠慨閮ㄩ棬鐝粍",width = 15,dictTable ="eam_base_repair_depart",dicText = "depart_name",dicCode = "id")
@@ -210,8 +222,6 @@
private String homePath;
// @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
private String teamId;
-// @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
- private String areaId;
/**
* 瀵嗙爜棣栨浣跨敤鏍囪瘑 1鏄� 0鍚�
--
Gitblit v1.9.3