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/Entity/Function/Scene.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 5869434..d301fbe 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -157,7 +157,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.rooms.Find(obj => obj.sid == roomId);
+ var findRoom = DB_ResidenceData.Rooms.Find(obj => obj.uid == roomId);
if (findRoom == null)
{
continue;
@@ -166,7 +166,7 @@
{
roomNameList += ",";
}
- roomNameList += findRoom.floorName + findRoom.name;
+ roomNameList += findRoom.floorName + findRoom.roomName;
}
if (roomNameList == "" )
{
--
Gitblit v1.8.0