Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-15 16f44651a78d00943aea51b26fc6a4f20518a648

 src/main/java/org/springblade/modules/alarm/entity/Alarm.java

@@ -141,6 +141,9 @@
      @ApiModelProperty(value = "是否生成警单(0:否 1：是)")
      private String jtype;
      private String rname;
      private String czTime;
      private String bz;
      private String jjTime;


}