Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wangfei

2024-09-09 26229b3779579ca0d413fa75b69e32795a5cfb30

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

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


}