Merge remote-tracking branch 'origin/master'

zengh

2022-02-21 7722aa86f1a0e2aacbf2fd17203789619e1c64e3

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

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

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


}