Merge remote-tracking branch 'origin/master'

zengh

2021-04-25 2297c50a14f92dd869edae212d4aabe8f0bf0572

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java

@@ -50,4 +50,8 @@
   private String threeId;
   private String deptId;
   private String timeDesc;

   private String securityArr;
   private String securityId;

}