From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java
index 7a3586e..d96ca75 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java
@@ -46,8 +46,9 @@
/**鏂囨。绫诲瀷*/
@Excel(name = "鏂囨。绫诲瀷", width = 15)
@ApiModelProperty(value = "鏂囨。绫诲瀷")
- @Dict(dicCode = "common_upload_type")
- private String type;
+// @Dict(dicCode = "common_upload_type")
+ @Dict(dictTable = "mom_eam_document_type",dicCode = "id",dicText = "name")
+ private String fileType;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
--
Gitblit v1.9.3