diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvSurveyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvSurveyServiceImpl.java index 70bc7e95..ff21f115 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvSurveyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/qsv/service/impl/QsvSurveyServiceImpl.java @@ -300,8 +300,8 @@ public class QsvSurveyServiceImpl extends BaseServiceImpl i List excelExportEntities = new ArrayList<>(); excelExportEntities.add(new ExcelExportEntity("工号", "loginName", 20)); excelExportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); - excelExportEntities.add(new ExcelExportEntity("单位", "unitName", 20)); - excelExportEntities.add(new ExcelExportEntity("分工会", "unionName", 20)); + excelExportEntities.add(new ExcelExportEntity("所属工会", "unionName", 20)); + excelExportEntities.add(new ExcelExportEntity("所属单位", "unitName", 20)); excelExportEntities.add(new ExcelExportEntity("联系方式", "mobile", 20)); for (QsvSubject subject : subjects) { excelExportEntities.add(new ExcelExportEntity(subject.getTitle(), subject.getId(), 20)); diff --git a/src/main/resources/static/components/module/activity/UserDataScope.vue b/src/main/resources/static/components/module/activity/UserDataScope.vue index c56a7160..3982722c 100644 --- a/src/main/resources/static/components/module/activity/UserDataScope.vue +++ b/src/main/resources/static/components/module/activity/UserDataScope.vue @@ -3,7 +3,7 @@