Merge remote-tracking branch 'origin/master'

wangfei

2024-10-21 d1302c929961b5ca0ed0845ddc2d5d51373701c7

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

@@ -102,7 +102,11 @@
    /**
     * 订单序号
     */
    private String orderSort;
    private Integer orderSort;
    /**
     * 是否合并
     */
    private Integer combine;
    /**
     * 旋转角度
     */