Merge remote-tracking branch 'origin/master'

zengh

2021-03-12 70f01fd17bb642c2f773d5c5567018d7573a2dde

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

@@ -38,4 +38,5 @@
   private  String channelNumber;
   private  String beginTime;
   private  String endTime;
   private  String name;
}