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

zc

2024-09-03 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c

 src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java

@@ -28,7 +28,7 @@


    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    //@Scheduled(cron = "${erp.refreshtime}")
    public void InCancelScheduler() {
        //log.info("InCancelScheduler开始了");
        if (!erpEnabled) return;