Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

昨天 2cf783a1480050c0f13907c5fde625edee8fce62

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -960,7 +960,8 @@
            merMemberPageDto.setStartBirthday(startBirthday.format(formatter));
        }
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){