From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 cea55be..c08f6cf 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
@@ -36,5 +36,13 @@
 	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;
 }

--
Gitblit v1.9.3