From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/org/springblade/modules/alarm/entity/Alarm.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/entity/Alarm.java b/src/main/java/org/springblade/modules/alarm/entity/Alarm.java
index 3dd43c8..625edcc 100644
--- a/src/main/java/org/springblade/modules/alarm/entity/Alarm.java
+++ b/src/main/java/org/springblade/modules/alarm/entity/Alarm.java
@@ -141,6 +141,9 @@
 		@ApiModelProperty(value = "是否生成警单(0:否 1：是)")
 		private String jtype;
 		private String rname;
+		private String czTime;
+		private String bz;
+		private String jjTime;
 
 
 }

--
Gitblit v1.9.3