From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
index 0a332ef..d7da931 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import java.util.EventObject;
@@ -15,7 +15,7 @@
private String msg;
private T data;
- private MediaServerItem mediaServerItem;
+ private MediaServer mediaServerItem;
private JSONObject response;
private SipSubscribe.EventResult<EventObject> event;
@@ -35,11 +35,11 @@
this.data = data;
}
- public MediaServerItem getMediaServerItem() {
+ public MediaServer getMediaServerItem() {
return mediaServerItem;
}
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
+ public void setMediaServerItem(MediaServer mediaServerItem) {
this.mediaServerItem = mediaServerItem;
}
--
Gitblit v1.8.0