From 5f1fdf638033a87980b84689fb6f29f70cf68c6e Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 05 七月 2021 11:15:35 +0800 Subject: [PATCH] Merge branch 'wxr6' into MergeFL --- HDL_ON/Entity/Function/Function.cs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 91adfe7..49768d5 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -1336,7 +1336,6 @@ #endregion - #region 璁惧绫� /// <summary> /// 绾㈠瀹� @@ -1394,6 +1393,12 @@ } #endregion + /// <summary> + /// 娌℃湁鐘舵�佹樉绀虹殑鍔熻兘spk鍒楄〃 + /// </summary> + public static List<string> NotStatusSpkList = new List<string> { + ElectricTV, FanIr, TvIr, TvXmIr, StbIr, PjtIr, IrLearn + }; /// <summary> /// 绗笁鏂瑰搧鐗屽垪琛� -- Gitblit v1.8.0