Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

2 天以前 f9ae4dd16bc60281d7c2f7489e45d4f17896b659

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java

@@ -65,4 +65,9 @@
        return password == null ? null : bCryptPasswordEncoder.encode(password);
    }

    @Override
    public User selectByUsernameWithoutTenant(String username, Long tenantId) {
        return baseMapper.selectByUsernameWithoutTenant(username,tenantId);
    }

}