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 |   18 ++++++++++++++++++
 1 files changed, 18 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 20bf20a..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
@@ -35,5 +35,23 @@
 	int type;
 	String pay;
 	String expireTime;
+	private  String beginTime;
+	private  String endTime;
+	private  String pid;
+	private String onlineStatus;
+	/**
+	 * 部门名称集
+	 */
+	private String deptName;
+
+	//设备是否处于报警状态
+	String jtype;
+	String contacts;
+	String call;
+	String paddress;
+	String deploymentTime;
+
+
+
 
 }

--
Gitblit v1.9.3