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