Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-07-01 975ace051bb6ed708090d7a15281a062a0d6dbc2

 src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java

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

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;