版本整合03

zhoushihao

2024-10-16 7956f09935a708f17b0f1b29a6625475f53c7509

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

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


}