Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-26 6f97a42dccaedb7a8950feac205080e63d8be439

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -191,7 +191,7 @@
      from sys_user u
      WHERE u.del_flag = 0
      <if test="names != null and names.size()>0">
         AND u.nick_name IN
         AND u.user_name IN
         <foreach collection="names" close=")" open="(" item="name" separator=",">
            #{name}
         </foreach>