Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

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

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

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


}