Merge remote-tracking branch 'origin/master'

doum

8 小时以前 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

 server/services/src/main/java/com/doumee/service/business/OrdersService.java

@@ -426,4 +426,9 @@
     */
    int autoCompleteOrders();

    /**
     * 打印订单标签
     */
    void printOrderLabel(Integer orderId, Integer shopId);

}