From 520f0c6c8704498ac339234f589b7c82a618a874 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 23 Jun 2021 10:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java b/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java
index 429a5eb..894d4f3 100644
--- a/src/main/java/org/springblade/modules/alarm/vo/AlarmVO.java
+++ b/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;
+
 
 }

--
Gitblit v1.9.3