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

zc

2024-09-06 4d4a869fef836b96968eac9554b91604127076ca

 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();