From 25eeaa21b7b34419f3b055f062e8030057c9b2c3 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 25 一月 2020 20:35:32 +0800
Subject: [PATCH] 优化设备显示

---
 java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java b/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java
index 434e587..db54b76 100644
--- a/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java
@@ -29,6 +29,7 @@
     private String locationTypeCd;
     private String locationTypeName;
     private String locationObjId;
+    private String[] locationObjIds;
     private String state;
     private String stateName;
     private String floorId;
@@ -41,7 +42,7 @@
 
 
 
-    private Date createTime;
+    private String createTime;
 
     private String statusCd = "0";
 
@@ -118,12 +119,11 @@
         this.machineIp = machineIp;
     }
 
-
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
@@ -247,4 +247,12 @@
     public void setLocationTypeName(String locationTypeName) {
         this.locationTypeName = locationTypeName;
     }
+
+    public String[] getLocationObjIds() {
+        return locationObjIds;
+    }
+
+    public void setLocationObjIds(String[] locationObjIds) {
+        this.locationObjIds = locationObjIds;
+    }
 }

--
Gitblit v1.8.0