Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

ChengHong

2023-08-31 d0ef68af3fad9592c7bd9e61ed97244cd4a93e59

 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;