From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

---
 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