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

64850858

2021-06-25 0802677d0b609abc8de0f0d882c6dbf483fc1987

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

@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.service;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;

/**