Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-19 f77d03b3d8bfd3d6cea7e011fc5f0086a4693daf

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java

@@ -131,7 +131,7 @@
        log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
    }

    @Scheduled(fixedDelay = 1000)
//    @Scheduled(fixedDelay = 1000)
    public void temperingGlassAfter() {
        //暂不处理
    }