Merge remote-tracking branch 'origin/master'

wangfei

2024-10-18 083966e731ee3a0d2fca956c66cb4100c2d75c5e

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

@@ -144,7 +144,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;


}