From 54370bca059e5e12e45f8e8de50b5b1d49c0cac1 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Jun 2021 09:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-public

---
 src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
index f40c026..94a268a 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.java
@@ -162,7 +162,7 @@
 
 	/**
 	 * 查询当前保安需要处理和未处理以及处理完成的警情信息
-	 * @param alarmVO 需包含保安人员id,状态 status  1 查当前保安收到的警情和已接收的警情,已处理完成的  2:未接收的   3:处理完成的
+	 * @param alarmVO 需包含保安人员id  2:未接收的   3:处理完成的   4.处理中
 	 * @return
 	 */
 	List<AlarmVO> getAlarmList(@Param("alarm")AlarmVO alarmVO);

--
Gitblit v1.9.3