Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-06-27 26739237e2d93460eb869067a6004bfa63a1bdb8

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

@@ -81,6 +81,11 @@
     */
    private String mediaServerId;

    /**
     * 使用的服务ID
     */
    private String serverId;

    public String getVhost() {
        return vhost;
    }
@@ -219,5 +224,13 @@
    public void setMediaServerId(String mediaServerId) {
        this.mediaServerId = mediaServerId;
    }

    public String getServerId() {
        return serverId;
    }

    public void setServerId(String serverId) {
        this.serverId = serverId;
    }
}