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

lty

5 天以前 c6e32e5da5d30ce2f74f0e32c3290d421c0951f2

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -109,7 +109,7 @@
        }
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            List<Order> orders = orderService.selectComplete8();
            for (Order order : orders) {
                try {
                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);