修改大理片进片程序

ZengTao

2024-10-23 f3e1240dc943cefae96860ea4cd4a82e4da3c41e

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

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


}