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

mk1990

2022-04-28 a0537d74df5b9c8ee65dba7c4e5bc6da7fc3d031

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

@@ -9,6 +9,11 @@
public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{

    /**
     * id
     */
    private Integer id;

    /**
     * 应用名
     */
    private String app;
@@ -111,6 +116,13 @@
        }
    }

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public String getApp() {
        return app;