From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 314be15..d2a4401 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -101,6 +101,15 @@
* 鍘熺墖椤哄簭
*/
private Integer patternSequence;
+ /**
+ * x鍧愭爣
+ */
+ private Integer xAxis;
+
+ /**
+ * y鍧愭爣
+ */
+ private Integer yAxis;
/**
* 閽㈠寲鐗堝浘id
@@ -153,6 +162,10 @@
* 闄よ啘鏂瑰紡
*/
private Integer filmRemove;
+ /**
+ * 鐘舵��
+ */
+ private Integer status;
}
--
Gitblit v1.8.0