Merge remote-tracking branch 'origin/master'

Administrator

2021-04-23 0b9ceeec9c387b1499486468779b5c67bec00113

 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;


}