Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-19 17e2f65826b3b69871e45c88238e5c7317f7ecb7

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java

@@ -46,7 +46,7 @@

    @Override
    public List<SeckillActivityVO> listSeckillActivity(Goods goods) {
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        LoginUser loginUserApplet = tokenService.getLoginUser();
        AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
        goods.setVipId(appUser.getVipId());
        return seckillActivityInfoMapper.listSeckillActivity(goods);