Merge remote-tracking branch 'origin/hxb' into Dev-Wxr

wxr

2022-09-02 04c9e08d5069c986c918fa2e98b22dd85921effd

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

@@ -183,8 +183,8 @@
        public List<HDL_ON.Entity.Function> GetGatewayDeviceList()
        {
            var list = Entity.FunctionList.List.GetDeviceFunctionList();
            return GetTestDevice(list, true);
            //return list;
            //return GetTestDevice(list, true);
            return list;
        }
        /// <summary>
        /// 获取场景列表