Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-22 bac00b1bc932d3a85f90986466757b24d9407d61

 HDL_ON/Entity/FunctionList.cs

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