Changes

严智鑫

2024-10-12 7b7c0fffa689fd13160e97ed6df81e636c41a606

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

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


}