From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
index 64bc243..1126081 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
@@ -1,9 +1,5 @@
package com.genersoft.iot.vmp.vmanager.bean;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItemLite;
-
/**
* @author lin
*/
@@ -11,7 +7,7 @@
/**
* 鎺ㄦ祦鐨勫悇涓柟寮忔祦鍦板潃
*/
- private StreamInfo streamInfo;
+ private StreamContent streamInfo;
/**
* 缂栫爜鏍煎紡
@@ -29,11 +25,11 @@
private String stream;
- public StreamInfo getStreamInfo() {
+ public StreamContent getStreamInfo() {
return streamInfo;
}
- public void setStreamInfo(StreamInfo streamInfo) {
+ public void setStreamInfo(StreamContent streamInfo) {
this.streamInfo = streamInfo;
}
--
Gitblit v1.8.0