From 76c5ad320495758d4e76d852d96914f1b405ece7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index 9ce89d0..e2a6fc7 100644
--- a/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -83,9 +83,9 @@
/**
* 浣跨敤閮ㄩ棬
*/
- @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id", orderNum = "9")
+ @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "base_factory", dicText = "factory_name", dicCode = "id", orderNum = "9")
@ApiModelProperty(value = "浣跨敤閮ㄩ棬")
- @Dict(dicCode = "mdc_production, production_name, id")
+ @Dict(dicCode = "base_factory, factory_name, id")
private String orgId;
/**
* 璁惧绠＄悊鍛�
--
Gitblit v1.9.3