Merge branch 'CJL' into NewFilePath

wxr

2020-12-22 7ddc5830cc495d69119b9b0ae33353397bd0521f

 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)
            {