Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

tangzy

2021-03-12 154f88ef4b69339811a904db517bdb75c870b234

 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;


}