新增上片界面

wangfei

2024-10-15 24fb859f5ff1b36ec902b6770ab99c2c70558db2

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

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


}