Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

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

 		SELECT u.* FROM sys_user u
 		INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
 		INNER JOIN sys_dept d ON u.dept_id = d.dept_id
-		WHERE upr.role_id = #{roleId} AND d.dept_id = #{deptId};
+		WHERE ur.role_id = #{roleId} AND d.dept_id = #{deptId};
 	</select>
 	
 </mapper>