From 6cd111e533c4c0fe3c02cec7272227fbe79c4ea4 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 12 十二月 2024 09:02:32 +0800
Subject: [PATCH] 更改保存时的提示

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java |    7 +++++--
 1 files changed, 5 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 d7d5958..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
@@ -106,10 +106,13 @@
     /**
      * 鏄惁鍚堝苟
      */
-    private Integer merge;
+    private Integer combine;
     /**
      * 鏃嬭浆瑙掑害
      */
     private double rotateAngle;
-
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
 }

--
Gitblit v1.8.0