From 2c47c8c86b0a685e92b0a605ae6f96901cf10555 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 21 一月 2021 09:24:32 +0800
Subject: [PATCH] Merge pull request #42 from lawrencehj/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 d91a1c7..35cb6bf 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
@@ -11,7 +11,7 @@
 	/**
 	 * 鎶ヨ绾у埆, 1涓轰竴绾ц鎯�, 2涓轰簩绾ц鎯�, 3涓轰笁绾ц鎯�, 4涓哄洓绾� 璀︽儏-
 	 */
-	private String alarmPriorit;
+	private String alarmPriority;
 
 	/**
 	 * 鎶ヨ鏂瑰紡 , 1涓虹數璇濇姤璀�, 2涓鸿澶囨姤璀�, 3涓虹煭淇℃姤璀�, 4涓� GPS鎶ヨ, 5涓鸿棰戞姤璀�, 6涓鸿澶囨晠闅滄姤璀�,
@@ -53,12 +53,12 @@
 		this.deviceId = deviceId;
 	}
 
-	public String getAlarmPriorit() {
-		return alarmPriorit;
+	public String getAlarmPriority() {
+		return alarmPriority;
 	}
 
-	public void setAlarmPriorit(String alarmPriorit) {
-		this.alarmPriorit = alarmPriorit;
+	public void setAlarmPriority(String alarmPriority) {
+		this.alarmPriority = alarmPriority;
 	}
 
 	public String getAlarmMethod() {

--
Gitblit v1.8.0