From 901a05d4dcf6a61f3387715f7074831a7ce04ead Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 7464415..058f9bc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -122,6 +122,13 @@
@ApiModelProperty(value = "璁惧鍔熺巼")
private String devicePower;
+ /**
+ * 璁惧鐘舵��
+ */
+ @Excel(name = "璁惧鐘舵��", width = 15)
+ @ApiModelProperty(value = "璁惧鐘舵��")
+ private Integer equipmentStatus;
+
/**閮ㄩ棬鍚嶇О*/
private transient String orgCodeTxt;
--
Gitblit v1.9.3