Merge branch 'hangzhou_master' of http://10.153.19.25:10101/r/HangZhouMes i...

wangfei

2024-10-16 35081d417369dece26c4e076e949fcfb0704c068

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

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


}