From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 360d7c0..1207c0b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -23,6 +23,8 @@
public Function functionMusic = new Function();
+
+
/// <summary>
///淇濆瓨褰撳墠闊充箰鍒楄〃
/// </summary>
@@ -61,10 +63,13 @@
/// 璁板綍婊戝姩闊抽噺鏉℃椂闂�<鐢ㄦ潵澶勭悊闊抽噺璺冲姩>
/// </summary>
public static DateTime ProgressDateTime = DateTime.MinValue;
+
/// <summary>
/// 闊充箰鎾斁鍣↖D
/// </summary>
public string UniqueDeviceName = string.Empty;
+
+
public MusicInfo CurrentMusic = new MusicInfo();
@@ -116,7 +121,6 @@
public Slaves Slave = new Slaves();
-
/// <summary>
/// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
--
Gitblit v1.8.0