Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

lawrencehj

2021-07-28 619a66f9998fa646a69903a4c22e2bbf92e2221b

 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java

@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.conf;

import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;