From f551026ffbfc37ff79bae0aef0e16264fc49e7d5 Mon Sep 17 00:00:00 2001
From: 15178832520 <121184950@qq.com>
Date: 星期四, 11 六月 2020 15:05:05 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
index d36fa3e..7acfbf5 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
@@ -17,6 +17,7 @@
     private String locationTypeCd;
     private String locationObjId;
     private String state;
+    private String stateName;
 
 
     private String floorId;
@@ -26,6 +27,11 @@
     private String roomId;
     private String roomNum;
     private String locationObjName;
+    private String direction;
+    private String directionName;
+
+
+    private String createTime;
 
     public String getMachineId() {
         return machineId;
@@ -178,4 +184,36 @@
     public void setLocationObjName(String locationObjName) {
         this.locationObjName = locationObjName;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDirection() {
+        return direction;
+    }
+
+    public void setDirection(String direction) {
+        this.direction = direction;
+    }
+
+    public String getDirectionName() {
+        return directionName;
+    }
+
+    public void setDirectionName(String directionName) {
+        this.directionName = directionName;
+    }
 }

--
Gitblit v1.8.0