处理冲突

xiaoxie

2022-05-23 d739bfa5976e36ced26f906ab16f83c20c8cb27c

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

@@ -1,15 +1,16 @@
package com.genersoft.iot.vmp.media.zlm.dto;

public enum OriginType {
    // 不可调整顺序
    UNKNOWN("UNKNOWN"),
    RTMP_PUSH("PUSH"),
    RTSP_PUSH("PUSH"),
    RTP_PUSH("RTP"),
    RTC_PUSH("PUSH"),
    PULL("PULL"),
    FFMPEG_PULL("PULL"),
    MP4_VOD("MP4_VOD"),
    DEVICE_CHN("DEVICE_CHN");
    DEVICE_CHN("DEVICE_CHN"),
    RTC_PUSH("PUSH");

    private final String type;
    OriginType(String type) {