Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-08-29 e0ea1f4a21321f145be79556896181f23f22b708

 src/main/java/com/mzl/flower/mapper/payment/OrderMapper.java

@@ -18,6 +18,8 @@
public interface OrderMapper extends BaseMapper<Order> {
    void setPartnerOrderReceive();

    List<Order> getPartnerOrderReceive();

    List<OrderStatusCountDTO> getOrderStatusCount(@Param("condition") OrderQueryDTO dto);

    List<OrderListDTO> selectOrderList(Page page, @Param("condition") OrderQueryDTO dto);
@@ -33,4 +35,5 @@

    List<Order> getOrderForBill(@Param("startTime")LocalDateTime startTime
            , @Param("endTime")LocalDateTime endTime);

}