Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-24 100018950d03efb3b7b2ae26dbd69c0bb2573c28

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

@@ -34,6 +34,6 @@
     */
    List<OrderPageListVo> getOrderPageList(PageInfo<OrderPageListVo> pageInfo,  @Param("item") OrderPageList orderPageList);

    OrderStatistics getOrderStatistics(@Param("startTime")LocalDateTime startTime,
                                       @Param("endTime") LocalDateTime endTime);
    OrderStatistics getOrderStatistics(@Param("startTime")String startTime,
                                       @Param("endTime") String endTime);
}