Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-18 c23f48c5ec15476299edadd91fa18f908d710a4f

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -40,6 +40,8 @@
    List<Order> getOrderByGroupPurchaseId(@Param("id") Long id);
    Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO);

    Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO);

    List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO);

    /**