Sfoglia il codice sorgente

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

seyason 2 anni fa
parent
commit
be8806e10b

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4159,10 +4159,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 //            titles.add("项目分类");
             titles.add(MessageUtils.message("entry.serialNo"));
             titles.add(MessageUtils.message("entry.No"));
-            titles.add(MessageUtils.message("excel.staff"));
             for (int i = 0; i < userCustomList.size(); i++) {
                 titles.add(userCustomList.get(i).getName());
             }
+            titles.add(MessageUtils.message("excel.staff"));
             titles.add(MessageUtils.message("entry.department"));
             titles.add(MessageUtils.message("entry.projectId"));
             titles.add(MessageUtils.message("entry.projectName"));