Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-12 86dbb4e751bb5c4990d082a070d409ee75ed3745

 hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java

@@ -46,7 +46,7 @@
    }
    @Test
    public void testFindPa4() {
        TemperingGlassInfo glass = temperingAgoService.selectOverGlass();
        List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
        log.info("等待中的玻璃：{}", Arrays.asList(glass));
    }
}