被覆盖代码找回

wangfei

2024-10-17 32bc1fb9a3692c460d21f8094ca80f1e0e0eb6a6

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

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


}