From 2e9b4b4e5e86c84088c45563cd61d18d8c7e5fea Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 十一月 2020 19:38:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
index 8ba43c2..d91a1c7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.bean;
+
public class DeviceAlarm {
/**
@@ -42,6 +43,7 @@
* 鎶ヨ绫诲瀷
*/
private String alarmType;
+
public String getDeviceId() {
return deviceId;
@@ -106,5 +108,4 @@
public void setAlarmType(String alarmType) {
this.alarmType = alarmType;
}
-
}
--
Gitblit v1.8.0