Merge remote-tracking branch 'origin/master'

wangfei

2024-11-08 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java

@@ -106,7 +106,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;
    /**
     * 旋转角度
     */