From 3c10f26f0675baeda3cf6c244b3f9fa290cce027 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 10 十二月 2024 15:58:14 +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 | 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