Merge branch 'master' of http://gitlab.oytour.com/liudong1993/property

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -2738,8 +2738,8 @@ namespace Property.WebApi.Controllers.User
                             new ExcelColumn(value:item.WModel.Name){ },
                             new ExcelColumn(value:item.SModel.BrandName){ },
                             new ExcelColumn(value:((item.Type == 1 ? "增加" : "减少")+item.DetailNum+item.SModel.Units)){ },
-                            new ExcelColumn(value:( CacheManager.User.UserReidsCache.GetEmployee(item.DetailBy)?.EmName ?? "")){ },
                              new ExcelColumn(value:item.DetailDate.ToString("yyyy-MM-dd HH:mm:ss")){ },
+                            new ExcelColumn(value:( CacheManager.User.UserReidsCache.GetEmployee(item.DetailBy)?.EmName ?? "")){ },
                         }
                     };
                     slist.Add(datarow);