1、移除义乌原片仓储旧代码

zhoushihao

2024-10-11 17f04597b31e6a5a430da2967687888ee72ad8a2

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

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


}