Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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

@@ -167,6 +167,11 @@
      where u.user_name = #{userName} and u.del_flag = '0'
   </select>

   <select id="getUserByUserName" parameterType="String" resultMap="SysUserResult">
      <include refid="selectUserVo"/>
      where u.user_name = #{userName} and u.del_flag = '0'
   </select>


   <select id="selectUserByNickName" parameterType="String" resultMap="SysUserResult">
      <include refid="selectUserVo"/>