Merge remote-tracking branch 'origin/master'

zengh

2022-03-09 29d7fafb766ed9eec51da333cda5eb5de979647a

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

@@ -178,4 +178,10 @@
   @TableField("securityArr")
   private String securityArr;

   /**
    * 巡逻路线
    */
   private String xllx;


}