Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java

@@ -158,9 +158,11 @@
   private String czTime;
   private String bz;
   private String cid;
   private String vaddress;
   private String aaddress;

   @TableLogic
   private Integer isDeleted;
//   @TableLogic
//   private Integer isDeleted;


}