From b847c06d8617efb2cbbad6f11b0344b779138e92 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 14 十月 2024 18:03:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 7d2996e..5e66d36 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -100,11 +100,11 @@
                 case SPK.CurtainTrietex:
                 //绌鸿皟
                 case SPK.AcStandard:
-                case SPK.HvacAC:
+                case SPK.HvacAC:case SPK.HvacAcPanel:
                 case SPK.AcIr:
                 //鍦扮儹
                 case SPK.FloorHeatStandard:
-                case SPK.HvacFloorHeat:
+                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                 //鏂伴
                 case SPK.AirFreshStandard:
                 case SPK.HvacAirFresh:

--
Gitblit v1.8.0