Merge branch 'WJC' into wxr7

wxr

2021-08-28 ea8f01fd99a2ef85bf96623c1bf90e84128cbe5c

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

@@ -56,6 +56,8 @@
                case SPK.AcStandard:
                //地热
                case SPK.FloorHeatStandard:
                //新风
                case SPK.AirFreshStandard:
                    {

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