被覆盖代码找回

wangfei

2024-10-17 0b8f1db9b9db6ec216091e953303a752c91aa307

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

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


}