From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 2 +-
1 files changed, 1 insertions(+), 1 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 33c9701..5b77bf4 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
@@ -142,7 +142,7 @@
/**
* 鏉ユ簮鍥藉
*/
- @Excel(name = "鏉ユ簮鍥藉", width = 25, orderNum = "14")
+ @Excel(name = "鏉ユ簮鍥藉", width = 25, dicCode = "source_country", orderNum = "14")
@ApiModelProperty(value = "鏉ユ簮鍥藉")
private String originCountry;
/**
--
Gitblit v1.9.3