From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
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 531a78a..aeb9b39 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.rooms.Find(s => s.sid == rId);
+ var r = DB_ResidenceData.Rooms.Find(s => s.uid == rId);
if(r == null)
{
continue;
@@ -209,7 +209,7 @@
foreach (var m in Music.A31MusicModel.A31MusicModelList)
{
- if (m.roomIds.Contains(room.sid))
+ if (m.roomIds.Contains(room.uid))
{
Music.SendMethod.Pause(m);
}
--
Gitblit v1.8.0