义乌新增掰片/识别、卧式缓存、磨边（冷加工）页面 前端路由配置等

wangfei

2024-11-18 a5a12dfed331c5d2508e1acee474c9d6dc35b774

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

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


}