Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

 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);
    }