Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-04-12 b922fe4d80f7e278b1ff958c4c95626b27cf8266

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

@@ -39,7 +39,7 @@
        }
    }

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