Merge remote-tracking branch 'origin/master' into pim_zss

zss

2025-08-14 03df670a1dfbcae8031e84e15dff0b77365f0af6

 src/main/resources/mapper/system/SysUserDeptMapper.xml

@@ -19,7 +19,7 @@
            </if>
            <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
                AND T1.user_id IN (
                SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
                )
            </if>
        </where>