From 0d66cd4223c804b0a1384559f481b0c81d4e1955 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:41:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index e96653e..1f173f3 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -118,7 +118,7 @@
/**
* 宸ユ
*/
- @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4")
+ @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4",dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
@ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
private String factoryOrgCode;
@@ -162,8 +162,9 @@
/**
* 缁翠慨鐝粍
*/
- @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10")
+ @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10",dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
@ApiModelProperty(value = "缁翠慨鐝粍")
+ @Dict(dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
private String repairDepartOrgCode;
/**
--
Gitblit v1.9.3