Merge remote-tracking branch 'origin/dev' into dev

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

@@ -110,7 +110,7 @@
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.user_name = #{userName}
+		where u.status = 0 and u.user_name = #{userName}
 	</select>
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">