From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
index c5e2a24..e16c1ad 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -30,7 +30,7 @@
private String rtsps;
private String rtc;
private String mediaServerId;
- private JSONArray tracks;
+ private Object tracks;
public static class TransactionInfo{
public String callId;
@@ -105,11 +105,11 @@
this.rtsp = rtsp;
}
- public JSONArray getTracks() {
+ public Object getTracks() {
return tracks;
}
- public void setTracks(JSONArray tracks) {
+ public void setTracks(Object tracks) {
this.tracks = tracks;
}
--
Gitblit v1.8.0