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

whycq

2023-08-28 d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020

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

@@ -30,4 +30,9 @@
     */
    List<OrderMergeVo> mergePreview(List<Long> ids);

    /**
     * 查询上报完结历史档
     * @return
     */
    List<Order> selectToBeHistoryOrder();
}