Merge remote-tracking branch 'origin/master'

648540858

2024-04-30 edfd528dd585c2279b9575ddfceb2af36fc0c240

 src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java

@@ -3,7 +3,7 @@
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.media.event.mediaServer.MediaServerChangeEvent;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;