From 8e941a8eac3329725cdd59cfa2bf3482ccbf057a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

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

diff --git a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
index 03dc024..0fb44e9 100644
--- a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
@@ -13,7 +13,7 @@
     </resultMap>
 
     <select id="listPage" resultMap="RulesRegulationsManagementDTOMap">
-        select rrm.*, su.user_name as create_user_name
+        select rrm.*, su.nick_name as create_user_name
         from rules_regulations_management rrm
         left join sys_user su on rrm.create_user = su.user_id
         <where>

--
Gitblit v1.9.3