From 3c89b91df438a2364ee30f6231a76daaecf978ff Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 03 九月 2026 14:56:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
index 03dc024..89d0869 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>
@@ -28,4 +28,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3