From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index e454896..5de9386 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -188,7 +188,6 @@
 	@Schema(description = "SIP浜や簰IP锛堣澶囪闂钩鍙扮殑IP锛�")
 	private String localIp;
 
-
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -389,6 +388,7 @@
 		this.geoCoordSys = geoCoordSys;
 	}
 
+
 	public String getTreeType() {
 		return treeType;
 	}

--
Gitblit v1.8.0