Merge remote-tracking branch 'origin/master'

zengh

2021-03-11 a67506723c8c8e6f0d223b864eaa69423a2710a8

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

@@ -160,6 +160,7 @@
   @TableField("czTime")
   private String czTime;
   private String bz;
   private int cid;


}