1、将原片相关代码提取到公共模块，解决模块间调用异常

zhoushihao

2024-11-07 3debb9073e9fde7ae118a8844ad54a86ee69cd44

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

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


}