Merge remote-tracking branch 'origin/master'

Administrator

2021-03-12 a5b6b004f1737bf06aaaeb8d06e40b9702de25e5

 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;


}