From 8b4825afee9300eee48ffdc61dd87e46f19a1201 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 23 Apr 2021 16:36:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index 7d2a81f..f6dfea9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -37,5 +37,17 @@
 	String expireTime;
 	private  String beginTime;
 	private  String endTime;
+	private  String pid;
+	private String onlineStatus;
+
+	//设备是否处于报警状态
+	String jtype;
+
+	String contacts;
+	String call;
+	String paddress;
+	String deploymentTime;
+
+
 
 }

--
Gitblit v1.9.3