From bbfb4d9d66d230e4ae55d51bf2df1a747dc1a25a Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 24 六月 2025 11:16:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/jeecg/modules/system/entity/SysUser.java | 4 ++-- 1 files changed, 2 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..233d20b 100644 --- a/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -184,8 +184,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