Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-09 8f5885b9efcc9616733bd69e8c55339d648f9e9e

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

@@ -104,6 +104,10 @@
     */
    private Integer orderSort;
    /**
     * 是否合并
     */
    private Integer merge;
    /**
     * 旋转角度
     */
    private double rotateAngle;