From 31bb16817c3702b4515a05e010dffa8b490c83b6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hysn' into hysn

---
 src/main/resources/mapper/basic/SupplierManageMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 4795904..9e65903 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -22,7 +22,7 @@
         T1.update_time,
         T1.update_user,
         T1.tenant_id,
-        T2.user_name AS maintainUserName
+        T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>
@@ -50,7 +50,7 @@
         T1.update_time,
         T1.update_user,
         T1.tenant_id,
-        T2.user_name AS maintainUserName
+        T2.nick_name AS maintainUserName
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>

--
Gitblit v1.9.3