Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-15 16f44651a78d00943aea51b26fc6a4f20518a648

 src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java

@@ -33,5 +33,9 @@
public class AlarmVO extends Alarm {
   private static final long serialVersionUID = 1L;
   private  String addvnm;
   private  String serialNumber;
   private  String stype;
   private  String channelNumber;


}