Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 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;


}