diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java index e95602f..876d7a3 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java @@ -222,7 +222,7 @@ public class ActUserController { add(new ExcelExportEntity("联系方式", "mobile", 20)); add(new ExcelExportEntity("职务", "position", 20)); add(new ExcelExportEntity("所属单位", "unitName", 20)); - add(new ExcelExportEntity("报名时间", "signUpTime", 20)); + add(new ExcelExportEntity("报名时间", "signUpTime2", 20)); add(new ExcelExportEntity("是否签到", "isSignInDesc", 20)); }}; response.setContentType("application/octet-stream"); diff --git a/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java b/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java index ca1ff4c..214d1b1 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java +++ b/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java @@ -38,7 +38,7 @@ public class ActUserServiceImpl extends BaseServiceImpl implements ActU Sql sql = Sqls.create(""" SELECT u.*, - DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime, + DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime2, CASE u.isSignIn WHEN 1 THEN '已签到' WHEN 0 THEN '未签到' diff --git a/backend/src/main/resources/views/platform/activity/itemApplyQuery/index.html b/backend/src/main/resources/views/platform/activity/itemApplyQuery/index.html index dd0e636..4b67764 100644 --- a/backend/src/main/resources/views/platform/activity/itemApplyQuery/index.html +++ b/backend/src/main/resources/views/platform/activity/itemApplyQuery/index.html @@ -67,7 +67,7 @@ layout("/layouts/platform_1.html"){
- 搜索 + 搜索
diff --git a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html index 51ac18a..68e6782 100644 --- a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html +++ b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html @@ -77,7 +77,7 @@ layout("/layouts/platform_1.html"){ - 导出 + 导出