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

chen.lin

2 天以前 79843611908e58f9538f8d8ebac62d3f0d01712c

 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);
    }

}