Merge remote-tracking branch 'origin/master'

xuhy

2025-02-18 9acb17a6871d84a85c373eb90b980f98894e30e0

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

@@ -105,7 +105,7 @@
     */
    Page<Order> queryPage(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
    Page<Order> queryPage1(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);

    List<Order> excelExportList(@Param("data") OrderQueryRequest orderQueryRequest);
    /**
     * 订单管理分页模块，订单数量统计
     *