修改进炉前显示

ZengTao

2024-10-14 32ff006f92134dd1fae4cd4d625560963dff3289

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

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


}