From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 ab36d71..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,9 +158,12 @@
 	private String czTime;
 	private String bz;
 	private String cid;
+	private String vaddress;
+	private String aaddress;
+	private String uids;
 
-	@TableLogic
-	private Integer isDeleted;
+//	@TableLogic
+//	private Integer isDeleted;
 
 
 }

--
Gitblit v1.9.3