From 4c50c77f3a5cf63746068d4a703e65792701bc09 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 30 五月 2025 16:42:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 543ad28..adfccae 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -33,11 +33,17 @@
@ApiModelProperty(value = "璁惧缂栫爜")
private String equipmentId;
/**
+ * 瀹夎浣嶇疆
+ */
+ @Excel(name = "瀹夎浣嶇疆", width = 15)
+ @ApiModelProperty(value = "瀹夎浣嶇疆")
+ private String equipmentName;
+ /**
* 璁惧鍚嶇О
*/
@Excel(name = "璁惧鍚嶇О", width = 15)
@ApiModelProperty(value = "璁惧鍚嶇О")
- private String equipmentName;
+ private String equipmentAddress;
/**
* 璁惧鍨嬪彿
*/
--
Gitblit v1.9.3