From 9e47d1426f494d68726de1d5cf7e704221a3fe3a Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 06 九月 2024 10:55:45 +0800
Subject: [PATCH] 读扫码枪socket通讯部分增加测试代码

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 54e844b..d7d5958 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
@@ -104,6 +104,10 @@
      */
     private Integer orderSort;
     /**
+     * 鏄惁鍚堝苟
+     */
+    private Integer merge;
+    /**
      * 鏃嬭浆瑙掑害
      */
     private double rotateAngle;

--
Gitblit v1.8.0