1、上片功能自测已完成等待联调

zhoushihao

2024-11-07 21505b0334dc8356a03c8a322d5188e3c62eb792

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

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


}