Merge remote-tracking branch 'origin/master'

zhoushihao

2025-04-14 e42b239ac2c2a922172badbe32afaa4ba4f615f8

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java

@@ -33,6 +33,14 @@
     */
    private Integer rawGlassHeight;
    /**
     * 原片厚度
     */
    private Integer rawGlassThickness;
    /**
     * 原片膜系
     */
    private String rawGlassFilmsId;
    /**
     * 上片设备编号
     */
    private Integer station;