From c71714508fbe3ace3543423c7700d7bbcca90056 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 12 八月 2025 13:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/system/entity/SysUser.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/src/main/java/org/jeecg/modules/system/entity/SysUser.java
index 945b3ae..3d2db93 100644
--- a/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -125,6 +125,12 @@
@Excel(name = "宸ュ彿", width = 15)
private String workNo;
+
+ /**
+ * 椋炰功id锛屽敮涓�閿�
+ */
+ @Excel(name = "椋炰功id", width = 15)
+ private String openId;
/**
* 鑱屽姟锛屽叧鑱旇亴鍔¤〃
*/
@@ -184,8 +190,8 @@
/**
* 璐熻矗浜х嚎
*/
- @Excel(name="璐熻矗浜х嚎",width = 15,dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
- @Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
+ @Excel(name="璐熻矗浜х嚎",width = 15,dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
+ @Dict(dictTable ="base_factory",dicText = "factory_name",dicCode = "id")
private String productionIds;
/**
--
Gitblit v1.9.3