Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

7 天以前 c3e47e5e70a9055b7d25c118eb1f7ec3c869e953

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

@@ -38,7 +38,7 @@
        }
    }

    @Scheduled(cron = "0/5 * * * * ? ")
//    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        String erpReport = Parameter.get().getErpReport();