Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-12 a5771725ac324c3dae366e6fcc38055b39ea4386

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

@@ -104,8 +104,15 @@
     */
    private Integer orderSort;
    /**
     * 是否合并
     */
    private Integer combine;
    /**
     * 旋转角度
     */
    private double rotateAngle;

    /**
     * 打标属性
     */
    private String markIcon;
}