From 5d208a214181394251e0ebea069a52b81b21a762 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 05 八月 2022 10:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
index a9c56d1..047e448 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
@@ -5,7 +5,6 @@
import lombok.Data;
import java.util.List;
-import java.util.Map;
/**
* 鏅�氳妭鐩�
@@ -16,9 +15,9 @@
// 闇�瑕佸鐞嗙殑鎾斁鍣↖D闆嗗悎,鏈�澶氭敮鎸�100涓挱鏀惧櫒鍚屾椂澶勭悊
private List<String> playerIds;
// 鎾斁鏃堕棿鎺掓湡锛屽鏋滀负绌猴紝浼氬叏澶�24灏忔椂寰幆鎾斁
- private Map schedule;
+ private PlayerSchedule schedule;
// 闇�瑕佹挱鏀剧殑椤甸潰鍐呭闆嗗悎
- private List<ProgramDto> pages ;
+ private List<PlayerPage> pages;
// 鑺傜洰涓嬭浇杩涘害閫氱煡鎺ュ彛锛屼細閫氳繃姝ゆ帴鍙ｅ皢鑺傜洰鐨勪笅杞借繘搴﹀彂缁欏鎴凤紝鎺ュ彛鐨勫搷搴旀椂闂翠笉鑳借秴杩�3s
private String noticeUrl;
--
Gitblit v1.9.3