From 49c12cd602a111eb417f3024b9ed965bcb0f69fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
index 8abd13d..16724a1 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
@@ -158,6 +158,9 @@
 	private String czTime;
 	private String bz;
 	private String cid;
+	private String vaddress;
+	private String aaddress;
+	private String uids;
 
 //	@TableLogic
 //	private Integer isDeleted;

--
Gitblit v1.9.3