Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-17 e18062feb4097017d21ab9c87728020a0043742b

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

@@ -111,5 +111,8 @@
     * 旋转角度
     */
    private double rotateAngle;

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