From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
index 8009dc8..d34c44d 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java
@@ -35,6 +35,7 @@
private String createTime;
+ private String heartbeatTime;
public String getMachineId() {
return machineId;
@@ -227,4 +228,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