Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

Junjie

2023-09-20 c8ec0494e03be47ec0f1b3a89ad5e0a004bd7501

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -23,11 +23,15 @@

    void remove(Long orderId);

    void report(Long orderId, Long userId);

    List<Order> selectComplete();

    /**
     * 订单合并预览
     */
    OrderMergeVo mergePreview(List<Long> ids);
    List<OrderMergeVo> mergePreview(List<Long> ids);

    List<Order> selectorderNoL(String orderNo);

}