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

skyouc

昨天 9279bad9ac573542041e3a3e0664b207d3c398b4

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

@@ -128,7 +128,7 @@

    /**损溢单完结上报 */
    @Scheduled(cron = "0/30 * * * * ?")
    @Async("checkOrderThreadPool")
    @Async("orderThreadPool")
    public void completeCheckOrderReport() {
        if (!ErpReportOld){
            return;