Merge remote-tracking branch 'origin/aerjiliya' into aerjiliya

ZengTao

2025-10-13 fb9a4fdf9ba08eaf300803dff945e0e431b717c4

 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;