Merge remote-tracking branch 'origin/master'

nnnjjj123

2021-01-29 047e1ec0b94317cc2a65657b4b101c5f769c3530

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