From a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 02 三月 2022 11:49:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc

---
 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 8b5383d..e8677a4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -123,9 +123,9 @@
                 for (int i = 0; i < musicListFunction.Count; i++)
                 {
                     var function = musicListFunction[i];
-                    var music = A31MusicModel.A31MusicModelList.Find((music) =>
-                   (music.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
-                     music.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+                    var music = A31MusicModel.A31MusicModelList.Find((obj) =>
+                   (obj.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
+                     obj.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
                     );
                     if (music == null)
                     {

--
Gitblit v1.8.0