From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 11:37:17 +0800
Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改,返回一键求助 3.报警设备报警时bug修复,新增判断接警员的在线状态和工作状态是否为空

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
index ff55404..6715cfb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
@@ -32,11 +32,31 @@
 @ApiModel(value = "AlarmVO对象", description = "AlarmVO对象")
 public class AlarmVO extends Alarm {
 	private static final long serialVersionUID = 1L;
-	private  String addvnm;
-	private  String serialNumber;
-	private  String stype;
-	private  String channelNumber;
-	private  String beginTime;
-	private  String endTime;
-	private  String name;
+	private String addvnm;
+	private String serialNumber;
+	private String stype;
+	private String channelNumber;
+	private String beginTime;
+	private String endTime;
+	private String name;
+	private String oneContacts;
+	private String twoContacts;
+	private String ThreeContacts;
+	private String onePhone;
+	private String twoPhone;
+	private String ThreePhone;
+	private String oneId;
+	private String twoId;
+	private String threeId;
+	private String deptId;
+	private String timeDesc;
+
+	private String securityArr;
+	private String securityId;
+	private String baname;
+	private String baid;
+	private String baphone;
+
+	private String deptName;
+
 }

--
Gitblit v1.9.3