From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java
index 47535a6..c6cf782 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/MobilePosition.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.gb28181.bean;
/**
- * @Description: 绉诲姩浣嶇疆bean
+ * @description: 绉诲姩浣嶇疆bean
* @author: lawrencehj
* @date: 2021骞�1鏈�23鏃�
*/
@@ -11,6 +11,11 @@
* 璁惧Id
*/
private String deviceId;
+
+ /**
+ * 閫氶亾Id
+ */
+ private String channelId;
/**
* 璁惧鍚嶇О
@@ -163,4 +168,12 @@
public void setCnLat(String cnLat) {
this.cnLat = cnLat;
}
+
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
}
--
Gitblit v1.8.0