Merge remote-tracking branch 'origin/master'

liusheng

8 天以前 42fb200e5c378ab7090e3aa4627faee8912eb67d

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -95,7 +95,7 @@


    public String loginByUserName(String userName) {
        SysUser sysUser = userService.selectUserByUserName2(userName);
        SysUser sysUser = userService.selectUserByUserNameAndDeptId(userName);
        if (ObjectUtils.isNotEmpty(sysUser)) {
            // 构建登录用户对象
            LoginUser loginUser = new LoginUser();