Merge branch 'master' into dev/zlm

648540858

2024-04-09 9abc1974a529c76f1d8c1a4d723af1d564859884

 src/main/java/com/genersoft/iot/vmp/gb28181/bean/InviteStreamInfo.java

@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.gb28181.bean;

import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.bean.MediaServer;

public class InviteStreamInfo {