From 91dddedca8cd2a2ada3b8a7837b3e9768ad001f6 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期四, 12 十二月 2024 10:48:00 +0800
Subject: [PATCH] 给磨边机不带磨量的尺寸

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 5fd3c47..db245d8 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
@@ -102,10 +102,17 @@
     /**
      * 璁㈠崟搴忓彿
      */
-    private String orderSort;
+    private Integer orderSort;
+    /**
+     * 鏄惁鍚堝苟
+     */
+    private Integer combine;
     /**
      * 鏃嬭浆瑙掑害
      */
     private double rotateAngle;
-
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
 }

--
Gitblit v1.8.0