Merge branch 'Dev-Branch' into wjc

mac

2023-09-11 cc37cf55c02da9e49eab9859ed72f146dee6f635

 HDL_ON/Entity/FunctionList.cs

@@ -190,7 +190,7 @@
        /// <returns></returns>
        public List<Function> GetVideoControlsList()
        {
            var spkList = SPK.GetVideoDoorLockSPKList();
            var spkList = SPK.GetVideoControlsSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

@@ -228,7 +228,7 @@
        /// </summary>
        public List<Function> GetElectricals()
        {
            var spkList = SPK.ElectricalSpkList();
        var spkList = SPK.ElectricalSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }