Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public

zhongrj

2022-12-05 2cad3b644a32880cfaf52f87bf6add621db81842

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

@@ -61,5 +61,10 @@
   private String manufacturers;
   private String deviceName;

   /**
    * 状态 status  1 查当前保安收到的警情和已接收的警情,已处理完成的  2：未接收的   3：处理完成的
    */
   private Integer status;


}