Merge remote-tracking branch 'origin/master'

zengh

2021-05-19 977444532d644d48b5b55ca89a1e3d62b5dd8782

 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;


}