Merge branch 'Dev-1.9' into Dev-Branch

wxr

2023-07-20 c135877a65244706008b6215b2734bb37bbfb7f4

 HDL_ON/Entity/Function/Scene.cs

@@ -560,6 +560,10 @@
        private Function ConvertFunctionObject()
        {
            var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
            if(localFunction == null)
            {
                localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
            }
            return localFunction;
        }

@@ -629,7 +633,12 @@
            return sceneFunctionInfo;
        }


        /// <summary>
        /// 设备
        /// 场景 =scene
        /// 群控=5
        /// </summary>
        public string type = "0";
    }

    /// <summary>