From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 15:31:43 +0800
Subject: [PATCH] Merge branch '级联' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
index 91f12d5..4fff352 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
@@ -109,14 +109,6 @@
return sipTransactionInfo;
}
- public MediaServerItem getMediaServerItem() {
- return mediaServerItem;
- }
-
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
- this.mediaServerItem = mediaServerItem;
- }
-
public String getApp() {
return app;
}
@@ -141,6 +133,14 @@
this.sipTransactionInfo = new SipTransactionInfo(response, false);
}
+ public MediaServerItem getMediaServerItem() {
+ return mediaServerItem;
+ }
+
+ public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ this.mediaServerItem = mediaServerItem;
+ }
+
public AudioBroadcastEvent getEvent() {
return event;
}
--
Gitblit v1.8.0