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/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs
index 07670b7..b22c7f6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs
@@ -136,7 +136,7 @@
             };
             bodyView.AddChidren(functionListView);
 
-            foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
+            foreach (var function in FunctionList.List.GetDeviceFunctionList())
             {
                 if (function == null)
                 {

--
Gitblit v1.8.0