zhoushihao
2024-10-17 7c8319c6b45850a47b4beaabd9442a02465aabcc
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -144,7 +144,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;
}