Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-08-25 3951a95284fb60ce9f625dcd17689d38ec7852dc

 src/main/java/com/genersoft/iot/vmp/service/IMediaService.java

old mode 100644
new mode 100755
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.service;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONArray;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;