Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

 src/main/resources/mapper/basic/SupplierManageMapper.xml

@@ -23,7 +23,8 @@
        T1.update_user,
        T1.tenant_id,
        T1.is_white,
        T2.nick_name AS maintainUserName
        T2.nick_name AS maintainUserName,
        T1.supplier_type
        FROM supplier_manage T1
        LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
        <where>