From 29191373aa1e8940d3ca6ce5a052182f99b37ba9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 01 三月 2022 22:07:01 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
index 4685d1f..ad158ec 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.media.zlm.dto;
+import com.genersoft.iot.vmp.common.StreamInfo;
+
import java.util.List;
public class MediaItem {
@@ -281,6 +283,8 @@
}
}
+ private StreamInfo streamInfo;
+
public String getApp() {
return app;
}
@@ -402,4 +406,12 @@
public void setMediaServerId(String mediaServerId) {
this.mediaServerId = mediaServerId;
}
+
+ public StreamInfo getStreamInfo() {
+ return streamInfo;
+ }
+
+ public void setStreamInfo(StreamInfo streamInfo) {
+ this.streamInfo = streamInfo;
+ }
}
--
Gitblit v1.8.0