Merge remote-tracking branch 'origin/master'

zengh

2021-07-02 d4156c11179e8c85ae635063377447c967ee055a

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

@@ -60,5 +60,6 @@
   private String deptName;
   private String deviceName;
   private String manufacturers;
   private String alarmlb;

}