From 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 16 八月 2025 13:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

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

diff --git a/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java b/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
index 27741e9..e6c3a54 100644
--- a/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
+++ b/src/main/java/com/zy/asrs/entity/param/GwmsGenerateInventoryDto.java
@@ -13,6 +13,9 @@
     private Integer palletizingNo;// 鐮佸灈浣嶇紪鍙�
 
     private List<MatList> matList; // 鏈ㄧ闆嗗悎
+    //1涓�鍘傚钩搴� 2 涓�鍘傜珛搴� 3浜屽巶骞冲簱 4浜屽巶绔嬪簱
+    private Integer warehouseType ;
+    private String groupOrderNumber; //缁勮揣鍗曞彿
 
     @Data
     public static class MatList{

--
Gitblit v1.9.1