From d2119be0539292e0885ca0670e791fd69ba1f875 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 10:02:46 +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 2e1ec29..93a5b14 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
@@ -162,7 +162,7 @@
/**
* 缁翠慨鐝粍
*/
- @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10",dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
+ @Excel(name = "缁翠慨鐝粍", width = 15, orderNum = "10")
@ApiModelProperty(value = "缁翠慨鐝粍")
@Dict(dictTable = "eam_base_repair_depart",dicText = "depart_name",dicCode = "org_code")
private String repairDepartOrgCode;
@@ -185,8 +185,9 @@
/**
* 鐏伀鍣�
*/
- @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16")
+ @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16",dicCode = "yn")
@ApiModelProperty(value = "鐏伀鍣�")
+ @Dict(dicCode = "yn")
private String fireExtinguisher;
/**
--
Gitblit v1.9.3