Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java

@@ -48,6 +48,7 @@
        Page<PromotionWishList> page = new Page<>(promotionWishListDTO.getPageCurr(), promotionWishListDTO.getPageSize());
        LambdaQueryWrapper<PromotionWishList> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(PromotionWishList::getMemberId,promotionWishListDTO.getMemberId());
        wrapper.orderByDesc(PromotionWishList::getCreateTime);
        Page<PromotionWishList> page1 = this.page(page, wrapper);
        return PageDTO.of(page1);
    }