Merge remote-tracking branch 'origin/master'

zengh

2021-05-19 977444532d644d48b5b55ca89a1e3d62b5dd8782

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

@@ -53,5 +53,10 @@

   private String securityArr;
   private String securityId;
   private String baname;
   private String baid;
   private String baphone;

   private String deptName;

}