Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 ff8edc9c28ad4f2b98b2cba014af267fd6ba41da

 ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml

@@ -105,6 +105,12 @@
   <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
       <include refid="selectUserVo"/>
      where u.user_name = #{userName} and u.del_flag = '0'
      and u.role_type = 1
   </select>
   <select id="selectUserShopByUserName" parameterType="String" resultMap="SysUserResult">
       <include refid="selectUserVo"/>
      where u.user_name = #{userName} and u.del_flag = '0'
      and u.role_type = 2
   </select>
   
   <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">