From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java
index 6ed83af..c422f42 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java
@@ -1,5 +1,7 @@
 package com.mes.opctask.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.util.Date;
@@ -16,6 +18,7 @@
     /**
      * 鍘嗗彶浠诲姟id
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     /**
      * 浠诲姟璇锋眰 0鏃犱换鍔� 1涓婄墖
@@ -30,6 +33,14 @@
      */
     private Integer rawGlassHeight;
     /**
+     * 鍘熺墖鍘氬害
+     */
+    private Integer rawGlassThickness;
+    /**
+     * 鍘熺墖鑶滅郴
+     */
+    private String rawGlassFilmsId;
+    /**
      * 涓婄墖璁惧缂栧彿
      */
     private Integer station;

--
Gitblit v1.8.0