From af96f51d29e2419d413f6171627841b6bb9a76bc Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 22 六月 2026 17:18:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁_泽淇实业

---
 src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
index 08cf865..dcb620a 100644
--- a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.ruoyi.collaborativeApproval.mapper.NoticeMapper">
 
     <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.NoticeDTO">
-        select n.*, su.user_name as create_user_name
+        select n.*, su.nick_name as create_user_name
         from notice n
         left join sys_user su on n.create_user = su.user_id
         <where>

--
Gitblit v1.9.3