Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-06-22 1e105fb6e1b44af3dd6d3f09ee4e7011f3e055a7

 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java

@@ -61,9 +61,14 @@
    private String originUrl;

    /**
     * 服务器id
     * 流媒体服务器id
     */
    private String mediaServerId;

    /**
     * 服务器id
     */
    private String severId;

    /**
     * GMT unix系统时间戳，单位秒
@@ -414,4 +419,12 @@
    public void setStreamInfo(StreamInfo streamInfo) {
        this.streamInfo = streamInfo;
    }

    public String getSeverId() {
        return severId;
    }

    public void setSeverId(String severId) {
        this.severId = severId;
    }
}