Merge branch 'CJL' into NewFilePath

wxr

2021-01-04 6955f92085a3702cfef5473fb14a77b3d9addbcf

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -442,8 +442,16 @@
        {
            if (Ins.IsRemote)
            {
                var pm = new DAL.Server.HttpServerRequest();
                var result = pm.ExecuteScene(scene.userSceneId);
                //云端做处理发送一端口场景
                //if (DB_ResidenceData.Instance.GatewayType == 0)
                //{
                //    new Control_Udp().ControlBusScenes(scene);
                //}
                //else
                {
                    var pm = new DAL.Server.HttpServerRequest();
                    var result = pm.ExecuteScene(scene.userSceneId);
                }
            }
            else
            {