Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

 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>