From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/Entity/FunctionList.cs | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 9b724ca..ce16d6d 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -87,15 +87,6 @@
var spkList = SPK.AirFreshSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
- /// <summary>
- /// 闈㈡澘鍒楄〃
- /// </summary>
- /// <returns></returns>
- public List<Function> GetPanelList()
- {
- var spkList = SPK.PanelSpkList();
- return Functions.FindAll((obj) => spkList.Contains(obj.spk));
- }
/// <summary>
/// 鑳芥簮鍒楄〃
--
Gitblit v1.8.0