hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -106,10 +106,13 @@ /** * 是否合并 */ private Integer merge; private Integer combine; /** * 旋转角度 */ private double rotateAngle; /** * 打标属性 */ private String markIcon; }