Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 64b84c33e8733228c624d07229026470497eb417

 HDL_ON/Entity/FunctionList.cs

@@ -207,7 +207,7 @@
            }
            try
            {
                deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
                deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
            }
            catch (Exception ex)
            {