Merge remote-tracking branch 'origin/master'

zengh

2021-04-09 abb5cea60f5a0c8735febd9a5cca5f768114d370

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

@@ -49,4 +49,5 @@
   private String twoId;
   private String threeId;
   private String deptId;
   private String timeDesc;
}