From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 4b2000d..6e5a4e0 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -161,7 +161,7 @@
{
continue;
}
- var r = DB_ResidenceData.residenceData.Rooms.Find(s => s.uid == rId);
+ var r = DB_ResidenceData.residenceData.Rooms.Find(s => s.roomId == rId);
if(r == null)
{
continue;
@@ -209,7 +209,7 @@
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIds.Contains(room.uid))
+ if (m.roomIds.Contains(room.roomId))
{
Music.SendMethod.Pause(m);
}
--
Gitblit v1.8.0