Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

3 天以前 5c90daa2c919f3f07df0a154ff91f0e015bf8d66

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

}