Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-27 64a71565792d4f2e9fd31eab6e98e972c12daa86

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

@@ -20,5 +20,5 @@

    OrderDetailVO getOrderDetail(Long orderId);

    boolean check(Long orderId, Long shopId);
    boolean check(String orderNumber, Long shopId);
}