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/ApplicationKeyDto.java |  133 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java b/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java
index 8abd40b..b569e56 100644
--- a/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java
@@ -18,15 +18,28 @@
     private String applicationKeyId;
     private String idCard;
     private String sex;
-    private String entTime;
+    private String endTime;
     private String machineId;
     private String typeCd;
+    private String typeCdName;
     private String name;
     private String tel;
     private String startTime;
     private String state;
+    private String stateName;
     private String age;
     private String communityId;
+    private String locationTypeCd;
+    private String locationTypeName;
+    private String locationObjId;
+    private String locationObjName;
+    private String floorId;
+    private String floorNum;
+    private String unitId;
+    private String unitNum;
+    private String roomId;
+    private String roomNum;
+    private String bId;
 
 
     private Date createTime;
@@ -58,13 +71,7 @@
         this.sex = sex;
     }
 
-    public String getEntTime() {
-        return entTime;
-    }
 
-    public void setEntTime(String entTime) {
-        this.entTime = entTime;
-    }
 
     public String getMachineId() {
         return machineId;
@@ -146,4 +153,116 @@
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getLocationTypeCd() {
+        return locationTypeCd;
+    }
+
+    public void setLocationTypeCd(String locationTypeCd) {
+        this.locationTypeCd = locationTypeCd;
+    }
+
+    public String getLocationTypeName() {
+        return locationTypeName;
+    }
+
+    public void setLocationTypeName(String locationTypeName) {
+        this.locationTypeName = locationTypeName;
+    }
+
+    public String getLocationObjId() {
+        return locationObjId;
+    }
+
+    public void setLocationObjId(String locationObjId) {
+        this.locationObjId = locationObjId;
+    }
+
+    public String getLocationObjName() {
+        return locationObjName;
+    }
+
+    public void setLocationObjName(String locationObjName) {
+        this.locationObjName = locationObjName;
+    }
+
+    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 getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
 }

--
Gitblit v1.8.0