From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
index e92a16f..4653128 100755
--- a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
@@ -51,6 +51,7 @@
     private String locationObjName;
     private String direction;//璁惧鏂瑰悜
     private String directionName;
+    private String typeId;
 
     private List<MachineAttrDto> machineAttrs;
 
@@ -310,4 +311,12 @@
     public void setHeartbeatTime(String heartbeatTime) {
         this.heartbeatTime = heartbeatTime;
     }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
 }

--
Gitblit v1.8.0