From bdfb519e59d7119dcf5835a4b6ebd6c4d2006470 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 16 十二月 2019 18:33:13 +0800
Subject: [PATCH] 合并代码

---
 java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java |  129 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 129 insertions(+), 0 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 cec2c14..3531d89 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
@@ -23,8 +23,24 @@
     private String communityId;
     private String machineName;
     private String machineTypeCd;
+    private String machineTypeCdName;
     private String machineIp;
     private String bId;
+    private String locationTypeCd;
+    private String locationTypeName;
+    private String locationObjId;
+    private String[] locationObjIds;
+    private String state;
+    private String stateName;
+    private String floorId;
+    private String floorNum;
+    private String unitId;
+    private String unitNum;
+    private String roomId;
+    private String roomNum;
+    private String locationObjName;
+
+
 
     private Date createTime;
 
@@ -127,4 +143,117 @@
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public String getMachineTypeCdName() {
+        return machineTypeCdName;
+    }
+
+    public void setMachineTypeCdName(String machineTypeCdName) {
+        this.machineTypeCdName = machineTypeCdName;
+    }
+
+
+    public String getLocationTypeCd() {
+        return locationTypeCd;
+    }
+
+    public void setLocationTypeCd(String locationTypeCd) {
+        this.locationTypeCd = locationTypeCd;
+    }
+
+    public String getLocationObjId() {
+        return locationObjId;
+    }
+
+    public void setLocationObjId(String locationObjId) {
+        this.locationObjId = locationObjId;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getLocationTypeName() {
+        return locationTypeName;
+    }
+
+    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