还原被覆盖代码

ZengTao

2024-10-24 7e634b208bd68e3bf9c2cfe6682f22a684b1a102

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

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


}