hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -144,7 +144,15 @@ /** * 是否合并 */ private Integer merge; private Integer combine; /** * 打标属性 */ private String markIcon; /** * 除膜方式 */ private Integer filmRemove; }