Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-29 1693c728681a1ed48a64374b1b7313806681154a

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java

@@ -16,7 +16,7 @@
 * @since 2024-11-21
 */
public interface OrderService extends IService<Order> {
    List<OrderVO> getOrderList(Integer status);
    List<OrderVO> selectOrderListByUserId(Integer status,Long userId);

    OrderDetailVO getOrderDetail(Long orderId);