From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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
old mode 100644
new mode 100755
index 7acfbf5..f8ee094
--- 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
@@ -1,7 +1,9 @@
package com.java110.vo.api.machine;
+import com.java110.dto.machine.MachineAttrDto;
+
import java.io.Serializable;
-import java.util.Date;
+import java.util.List;
public class ApiMachineDataVo implements Serializable {
@@ -18,6 +20,7 @@
private String locationObjId;
private String state;
private String stateName;
+ private String typeId;
private String floorId;
@@ -29,9 +32,11 @@
private String locationObjName;
private String direction;
private String directionName;
+ private List<MachineAttrDto> machineAttrs;
private String createTime;
+ private String heartbeatTime;
public String getMachineId() {
return machineId;
@@ -216,4 +221,28 @@
public void setDirectionName(String directionName) {
this.directionName = directionName;
}
+
+ public List<MachineAttrDto> getMachineAttrs() {
+ return machineAttrs;
+ }
+
+ public void setMachineAttrs(List<MachineAttrDto> machineAttrs) {
+ this.machineAttrs = machineAttrs;
+ }
+
+ public String getHeartbeatTime() {
+ return heartbeatTime;
+ }
+
+ public void setHeartbeatTime(String heartbeatTime) {
+ this.heartbeatTime = heartbeatTime;
+ }
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
}
--
Gitblit v1.8.0