From d41d6b34af2485198ed01e1888db1571e4da1a6a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 四月 2024 20:59:20 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.0'
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 32b6fac..8290a45 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -187,6 +187,18 @@
private double latitude;
/**
+ * 缁忓害
+ */
+ @Schema(description = "鑷畾涔夌粡搴�")
+ private double customLongitude;
+
+ /**
+ * 绾害
+ */
+ @Schema(description = "鑷畾涔夌含搴�")
+ private double customLatitude;
+
+ /**
* 缁忓害 GCJ02
*/
@Schema(description = "GCJ02鍧愭爣绯荤粡搴�")
@@ -226,7 +238,7 @@
* 鏄惁鍚湁闊抽
*/
@Schema(description = "鏄惁鍚湁闊抽")
- private boolean hasAudio;
+ private Boolean hasAudio;
/**
* 鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
@@ -586,4 +598,20 @@
public void setStreamIdentification(String streamIdentification) {
this.streamIdentification = streamIdentification;
}
+
+ public double getCustomLongitude() {
+ return customLongitude;
+ }
+
+ public void setCustomLongitude(double customLongitude) {
+ this.customLongitude = customLongitude;
+ }
+
+ public double getCustomLatitude() {
+ return customLatitude;
+ }
+
+ public void setCustomLatitude(double customLatitude) {
+ this.customLatitude = customLatitude;
+ }
}
--
Gitblit v1.8.0