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/ResponseSendItemMsg.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/ResponseSendItemMsg.java b/src/main/java/com/genersoft/iot/vmp/service/bean/ResponseSendItemMsg.java index 501621b..9d73384 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/bean/ResponseSendItemMsg.java +++ b/src/main/java/com/genersoft/iot/vmp/service/bean/ResponseSendItemMsg.java @@ -1,7 +1,7 @@ package com.genersoft.iot.vmp.service.bean; import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; -import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.media.bean.MediaServer; /** * redis娑堟伅锛氫笅绾у洖澶嶆帹閫佷俊鎭� @@ -11,7 +11,7 @@ private SendRtpItem sendRtpItem; - private MediaServerItem mediaServerItem; + private MediaServer mediaServerItem; public SendRtpItem getSendRtpItem() { return sendRtpItem; @@ -21,11 +21,11 @@ this.sendRtpItem = sendRtpItem; } - 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