From e52411aebbba634949a0021553e8517b796f481e Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 六月 2025 16:26:08 +0800
Subject: [PATCH] Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java |    8 ++++++++
 1 files changed, 8 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 a772b6e..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
@@ -33,6 +33,14 @@
      */
     private Integer rawGlassHeight;
     /**
+     * 鍘熺墖鍘氬害
+     */
+    private Integer rawGlassThickness;
+    /**
+     * 鍘熺墖鑶滅郴
+     */
+    private String rawGlassFilmsId;
+    /**
      * 涓婄墖璁惧缂栧彿
      */
     private Integer station;

--
Gitblit v1.8.0