From 0066150978efa004da69e580390a021ebef1824e Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 25 六月 2025 17:06:41 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
index 3557ec3..87dcc8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
@@ -13,6 +13,8 @@
     private String orderNo;
     /**瀹瑰櫒缂栫爜*/
     private String mergeNo;
+    /**鍏ュ簱绫诲瀷锛� 骞冲簱锛� CTU搴�*/
+    private Long inType;
     /**闇�缁勬墭鍚堝苟璁㈠崟鏄庣粏*/
     private List<OrderInfoDto> orderDetls;
 }

--
Gitblit v1.9.1