Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

wxr

2024-10-14 b847c06d8617efb2cbbad6f11b0344b779138e92

 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: