Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/Entity/FunctionList.cs

@@ -41,6 +41,26 @@
        public List<Function> Functions = new List<Function>();

        /// <summary>
        /// 绿建科技系统
        /// 总控列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetAcstParentList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
        }

        /// <summary>
        /// 绿建科技系统
        /// 子控列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetAcstSubList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.AcstSub);
        }

        /// <summary>
        /// 空调列表
        /// </summary>
        /// <returns></returns>
@@ -106,16 +126,17 @@
        /// <summary>
        /// 光伏列表
        /// </summary>
        public List<InverterInfo> InverterList
        public List<Function> InverterList()
        {
            get
            {
                return _inverterList;
            }
            set
            {
                _inverterList = value;
            }
            //get
            //{
            //    return _inverterList;
            //}
            //set
            //{
            //    _inverterList = value;
            //}
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
        }
        #region 家电列表 electricals
        /// <summary>