合并成功

wxr

2021-11-18 dd3f6db0cb3c242758ab0000a0513e093f02531c

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -67,6 +67,9 @@
                //新风
                case SPK.AirFreshStandard:
                case SPK.HvacAirFresh:
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                    {

                        LogicView.FunTypeView view = new LogicView.FunTypeView();