From e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 20 Mar 2021 08:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java |    4 ++--
 1 files changed, 2 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..8abd13d 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
@@ -159,8 +159,8 @@
 	private String bz;
 	private String cid;
 
-	@TableLogic
-	private Integer isDeleted;
+//	@TableLogic
+//	private Integer isDeleted;
 
 
 }

--
Gitblit v1.9.3