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 | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 ed92fad..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
@@ -27,8 +27,11 @@
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;
@@ -229,4 +232,28 @@
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