Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-09 8f5885b9efcc9616733bd69e8c55339d648f9e9e

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -73,7 +73,7 @@
                glassInfo.setYCoordinate(map.getYAxis());
                glassInfo.setAngle(map.getRotateAngle());
                glassInfo.setGlassId(map.getGlassId());
                glassInfo.setMerge(map.getMerge());
                glassInfo.setCombine(map.getMerge());
                // 将映射后的对象添加到结果列表中
                resultList.add(glassInfo);
            }