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

Administrator

23 小时以前 f5411014dd3c126258f02b9a5b7c513c0e5a248e

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

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java

@@ -36,7 +36,10 @@
        for (Job job : jobs) {
            jobService.saveJobLog(job);
        }

        jobs = jobMapper.listJobToLog(ConveyorStateType.OUTBOUND.getStatus(), 1);
        for (Job job : jobs) {
            jobService.saveJobLog(job);
        }
    }