Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

 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;


}