From abb5cea60f5a0c8735febd9a5cca5f768114d370 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 15:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 d22967c..0f99250 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
@@ -48,6 +48,10 @@
 	private String oneId;
 	private String twoId;
 	private String threeId;
-	private String deptId;
+
+	private String onlineStatus;
+
+	//设备是否处于报警状态
+	String jtype;
 
 }

--
Gitblit v1.9.3