Merge branch 'WJC' into wxr7

wxr

2021-08-20 46a5de6e9871c5c52ba4195576c1c2a4725abb08

 HDL_ON/Entity/FunctionList.cs

@@ -184,7 +184,6 @@
        /// <para>false:直接无条件添加</para></param>
        public void IniFunctionList(string filePath, bool checkRepeat = false)
        {
            MainPage.Log("初始化功能数据");
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
            {