处理冲突

xiaoxie

2022-05-23 d739bfa5976e36ced26f906ab16f83c20c8cb27c

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/bean/GbStreamParam.java

@@ -8,12 +8,22 @@

    private String platformId;

    private String catalogId;

    private List<GbStream> gbStreams;

    public String getPlatformId() {
        return platformId;
    }

    public String getCatalogId() {
        return catalogId;
    }

    public void setCatalogId(String catalogId) {
        this.catalogId = catalogId;
    }

    public void setPlatformId(String platformId) {
        this.platformId = platformId;
    }