From f2c1e5bf3a67478076fb5bbcf546824b3127db15 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期六, 12 十二月 2020 19:11:40 +0800 Subject: [PATCH] Merge branch 'NewFilePath' into CJL --- HDL_ON/Entity/Function/Scene.cs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index 8cc2700..16272e8 100644 --- a/HDL_ON/Entity/Function/Scene.cs +++ b/HDL_ON/Entity/Function/Scene.cs @@ -333,7 +333,7 @@ /// <returns></returns> Function ConvertFunctionObject() { - var localFunction = DB_ResidenceData.functionList.GetAllDeviceFunctionList().Find((obj) => obj.sid == sid); + var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid); foreach (var s in status) { localFunction.attributes.Add(new FunctionAttributes() { key = s.key, curValue = s.value, value = new List<string>() { s.value } }); -- Gitblit v1.8.0