Merge remote-tracking branch 'origin/master'

zengh

2021-02-27 939292b1cfd4fb4f714bb5ae09dbc2220cef06b4

 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;
}