From b31b4776f50e1ef0cfeeb95f5aac175a624086e4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 28 二月 2025 09:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 17 +++++++++++++++++
1 files changed, 17 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 f7feafb..b9f5401 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
@@ -145,6 +154,14 @@
* 鏄惁鍚堝苟
*/
private Integer combine;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
+ /**
+ * 闄よ啘鏂瑰紡
+ */
+ private Integer filmRemove;
}
--
Gitblit v1.8.0