Merge remote-tracking branch 'origin/master'

xuhy

9 天以前 33fea8cb7804ba9ee45a1c832907cbde5f336444

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -685,6 +685,10 @@
    public long selectIdByPhone(String phonenumber) {
        return userMapper.selectIdByPhone(phonenumber);
    }
    @Override
    public List<SysUser> listByRole(List<Long> userIds, String nickName) {
        return userMapper.listByRole(userIds,nickName);
    }

//    @Override
//    public UserInfoVo userInfo(Long userId) {