版本合并冲突修改

wxr

2022-06-30 cda315b3a19919cae922bdbe96bc20eab4e29fcc

 HDL_ON/Entity/FunctionList.cs

@@ -87,15 +87,6 @@
            var spkList = SPK.AirFreshSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 面板列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetPanelList()
        {
            var spkList = SPK.PanelSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 能源列表