Merge branch 'tzy2' into newBranch1

wxr

2021-07-01 3861152ee23bfc0724579299b6be188f5f16b192

 HDL_ON/Entity/FunctionList.cs

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