From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
old mode 100644
new mode 100755
index c70e36a..ddf81c4
--- a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
@@ -16,6 +16,7 @@
public class MachineDto extends PageDto implements Serializable {
public static final String MACHINE_TYPE_CAR = "9996";
+ public static final String MACHINE_TYPE_ACCESS_CONTROL = "9999";
public static final String MACHINE_STATE_ON = "1200";
public static final String MACHINE_STATE_OFF = "1300";
@@ -54,6 +55,7 @@
private String createTime;
private String statusCd = "0";
+ private String heartbeatTime;
public String getMachineMac() {
@@ -296,4 +298,12 @@
public void setMachineAttrs(List<MachineAttrDto> machineAttrs) {
this.machineAttrs = machineAttrs;
}
+
+ public String getHeartbeatTime() {
+ return heartbeatTime;
+ }
+
+ public void setHeartbeatTime(String heartbeatTime) {
+ this.heartbeatTime = heartbeatTime;
+ }
}
--
Gitblit v1.8.0