From d6df7c835547839c46d8a927888651f6fef59ee2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 18:13:36 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java b/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java
index a880b85..0da054f 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.media.event;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import org.springframework.context.ApplicationEvent;
import java.util.ArrayList;
@@ -13,22 +13,22 @@
super(source);
}
- private List<MediaServerItem> mediaServerItemList;
+ private List<MediaServer> mediaServerItemList;
- public List<MediaServerItem> getMediaServerItemList() {
+ public List<MediaServer> getMediaServerItemList() {
return mediaServerItemList;
}
- public void setMediaServerItemList(List<MediaServerItem> mediaServerItemList) {
+ public void setMediaServerItemList(List<MediaServer> mediaServerItemList) {
this.mediaServerItemList = mediaServerItemList;
}
- public void setMediaServerItemList(MediaServerItem... mediaServerItemArray) {
+ public void setMediaServerItemList(MediaServer... mediaServerItemArray) {
this.mediaServerItemList = new ArrayList<>();
this.mediaServerItemList.addAll(Arrays.asList(mediaServerItemArray));
}
- public void setMediaServerItem(List<MediaServerItem> mediaServerItemList) {
+ public void setMediaServerItem(List<MediaServer> mediaServerItemList) {
this.mediaServerItemList = mediaServerItemList;
}
}
--
Gitblit v1.8.0