Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

 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();