From a644c4bb75b173d14fad9ed7dc7cf85c41d4953a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 02 Mar 2021 23:12:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java |    4 +++-
 1 files changed, 3 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..ff55404 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,7 @@
 	private  String serialNumber;
 	private  String stype;
 	private  String channelNumber;
-
+	private  String beginTime;
+	private  String endTime;
+	private  String name;
 }

--
Gitblit v1.9.3