Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-05 416ec0563f02d3d5b84f9b1d36bb11afdec721ec

 hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java

@@ -106,7 +106,6 @@
    }
    @Test
    public void testOptimizeDetail() {

        List<Map<String, Object>> map2=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
                .selectAll(OptimizeDetail.class)
                .selectAs(OptimizeLayout::getWidth,"olWidth")