From c4338df18d6c2156e90769a777c633200112c814 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Mon, 14 Apr 2025 18:32:10 +0800
Subject: [PATCH] commit

---
 .../union/ActivityUnionManageController.java           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java
index 8eedd8b..d10fa58 100644
--- a/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java
+++ b/src/main/java/io/v/nutz/activity/controller/union/ActivityUnionManageController.java
@@ -299,10 +299,10 @@ public class ActivityUnionManageController {
         Sql sql = Sqls.create("""
                 SELECT
                 	u.id,
-                	u.loginname,
-                	u.username,
-                	u.unitname,
-                	u.unionname,
+                	u.loginname loginName,
+                	u.username userName,
+                	u.unitname unitName,
+                	u.unionname unionName,
                 	u.sex,
                 	u.mobile,
                 	atp.applyDateTime,
@@ -319,7 +319,7 @@ public class ActivityUnionManageController {
         cnd.asc("atp.unitName").asc("atp.unionName").asc("applyUserUserName");
         sql.setCondition(cnd);
 
-        List<ActivityTissuePerson> tissuePeople = tissuePersonService.listEntity(sql);
+        List<NutMap> tissuePeople = tissuePersonService.listMap(sql);
         List<ExcelExportEntity> entityList = new ArrayList<>();
         entityList.add(new ExcelExportEntity("姓名", "userName", 20));
         entityList.add(new ExcelExportEntity("工号", "loginName", 20));