Merge branch 'wvp-28181-2.0' into wvp-pro-record

648540858

2022-03-02 1dcdbc3742835ccab28a8983ae002d2bbdba87eb

 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;
    }