Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-30 f541eaa5c92cb112af6d3f656275105606d31b39

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -563,7 +563,9 @@
        TAppUser byId = appUserService.getById(userId);
        AppUserInfoDto appUserInfoDto = new AppUserInfoDto();
        TVip data = vipClient.getVipInfoByType(2).getData();
        appUserInfoDto.setMinPrice(data.getMonthlyCard());
        if(null != data){
            appUserInfoDto.setMinPrice(data.getMonthlyCard());
        }

        //判断会员
        if (byId.getVipEndTime()==null||byId.getVipEndTime().isBefore(LocalDateTime.now())){