From 09bb613cb75774426df43ecd5152aeac35e5315c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 09 九月 2024 15:01:56 +0800
Subject: [PATCH] 掰片查询修改为查卧式理片数据,钢化查询界面添加显示更多信息,去除重复玻璃id不能连续扫码限制,人工下片添加判断是否超尺寸

---
 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 66912e6..f7feafb 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
@@ -35,7 +35,7 @@
     /**
      * 娴佺▼鍗$幓鐠冪被鍨�
      */
-    private String glassType;
+    private Integer glassType;
 
     /**
      * 瀹�
@@ -141,6 +141,10 @@
      * 鐜荤拑ID
      */
     private String glassId;
+    /**
+     * 鏄惁鍚堝苟
+     */
+    private Integer combine;
 
 
 }

--
Gitblit v1.8.0