From 29077c9254b3a7d093203ed912d5a5f940f4bb28 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十二月 2024 15:54:11 +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/GlassInfo.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 b1c1238..81cb630 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
@@ -148,6 +148,10 @@
     /**
      * 棰勬帓鏍煎瓙
      */
-    private Integer Slot;
+    private Integer targetSlot;
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
 
 }

--
Gitblit v1.8.0