From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/Entity/FunctionList.cs | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 62b1fee..bef3882 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -143,25 +143,6 @@
/// </summary>
public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
- List<Function> _OtherBrandFunction;
- /// <summary>
- /// 绗笁鏂瑰搧鐗屽姛鑳�
- /// </summary>
- public List<Function> OtherBrandFunction
- {
- get
- {
- if(_OtherBrandFunction == null)
- {
- _OtherBrandFunction = new List<Function>();
- var spkList = SPK.GetAll3tySPK();
- _OtherBrandFunction = Functions.FindAll((obj) => spkList.Contains(obj.spk));
- }
- return _OtherBrandFunction;
- }
- }
-
-
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
@@ -289,9 +270,6 @@
return Functions;
}
-
-
-
/// <summary>
/// 娓呯┖璁惧鍔熻兘鍒楄〃
--
Gitblit v1.8.0