Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 4afe59c57d73bcc443f963921eb9a5cf757713de

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

@@ -35,7 +35,7 @@
    List<OrderPageListVo> getOrderPageList(PageInfo<OrderPageListVo> pageInfo,  @Param("item") OrderPageList orderPageList);

    OrderStatistics getOrderStatistics(@Param("startTime")String startTime,
                                       @Param("endTime") String endTime);
                                       @Param("endTime") String endTime, @Param("shopId") Integer shopId);


    /**