From e6a25dfa55101ca8b684eea2ae447e6e5c1e59d7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 03 九月 2024 15:37:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index 54e844b..d7d5958 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -104,6 +104,10 @@
*/
private Integer orderSort;
/**
+ * 鏄惁鍚堝苟
+ */
+ private Integer merge;
+ /**
* 鏃嬭浆瑙掑害
*/
private double rotateAngle;
--
Gitblit v1.8.0