From 2c2b1ab406d3049a0e69fff01e3daade5cbe90ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 19:59:26 +0800
Subject: [PATCH] 预警数量统计接口修改,新增按时间条件查询条件,违禁品统计接口修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java |   25 ++++++++++++++++++-------
 1 files changed, 18 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..1856f4e 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,22 @@
 @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;
 }

--
Gitblit v1.9.3