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 | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 7ab9c9e..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
@@ -21,10 +21,12 @@
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;
@@ -37,6 +39,7 @@
private String unitNum;
private String roomId;
private String roomNum;
+ private String bId;
private Date createTime;
@@ -238,4 +241,28 @@
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