From 8b4825afee9300eee48ffdc61dd87e46f19a1201 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 23 Apr 2021 16:36:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
index 96629b3..841a10e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/vo/ConditionVo.java
@@ -44,4 +44,9 @@
 	 * 分页记录数
 	 */
 	private Integer pageSize;
+
+	/**
+	 * 预警确认时间描述
+	 */
+	private String timeDesc;
 }

--
Gitblit v1.9.3