From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerPage.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerPage.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerPage.java
index d07f5c5..fcbd728 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerPage.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerPage.java
@@ -9,6 +9,8 @@
 
     //  椤甸潰鍚嶇О
     private String name;
+    //椤甸潰瀹氭椂
+    List<PageSchedules> schedules;
     //  椤甸潰涓婄殑缁勪欢
     private List<PlayerWidget> widgets;
 

--
Gitblit v1.9.3