From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 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 f6dfea9..3707015 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
@@ -39,10 +39,13 @@
 	private  String endTime;
 	private  String pid;
 	private String onlineStatus;
+	/**
+	 * 部门名称集
+	 */
+	private String deptName;
 
 	//设备是否处于报警状态
 	String jtype;
-
 	String contacts;
 	String call;
 	String paddress;
@@ -50,4 +53,5 @@
 
 
 
+
 }

--
Gitblit v1.9.3