From 48fad3582d81dd79423db1db5402d9f47fd5f30f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 09 二月 2023 14:13:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AlarmChannelMessage.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AlarmChannelMessage.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AlarmChannelMessage.java
index 96d25c4..7f50f4d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AlarmChannelMessage.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AlarmChannelMessage.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.bean;
+
/**
* 閫氳繃redis鍒嗗彂鎶ヨ娑堟伅
*/
@@ -8,12 +9,14 @@
* 鍥芥爣缂栧彿
*/
private String gbId;
-
/**
* 鎶ヨ缂栧彿
*/
private int alarmSn;
-
+ /**
+ * 鍛婅绫诲瀷
+ */
+ private int alarmType;
/**
* 鎶ヨ鎻忚堪
@@ -36,6 +39,14 @@
this.alarmSn = alarmSn;
}
+ public int getAlarmType() {
+ return alarmType;
+ }
+
+ public void setAlarmType(int alarmType) {
+ this.alarmType = alarmType;
+ }
+
public String getAlarmDescription() {
return alarmDescription;
}
--
Gitblit v1.8.0