From 4e53338c0c6859a43693f3f690f0c05da888a02e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 11:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/EquipmentInfomation.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/EquipmentInfomation.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/EquipmentInfomation.java
index e350009..a1995d7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/EquipmentInfomation.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/EquipmentInfomation.java
@@ -13,5 +13,6 @@
     private String EquipmentType;
     private String EquipmentMac;
     private String EquipmentState;
+    private String EquipmentName;
     private LocalDateTime EquipmentCreateTime;
 }

--
Gitblit v1.9.3