From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/Entity/FunctionList.cs | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 862f3b9..cce8348 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -7,11 +7,6 @@
{
public class FunctionList
{
- public FunctionList()
- {
-
- }
-
/// <summary>
/// 绌鸿皟鍒楄〃
/// </summary>
@@ -93,7 +88,6 @@
{
var fs = new List<Function>();
fs.AddRange(GetAllDeviceFunctionList());
- fs.AddRange(scenes);
return fs;
}
--
Gitblit v1.8.0