From 7074c73ea7e429a15c39dce8329f22961e8e2e3e Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 31 五月 2024 08:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/phyzasrs' into phyzasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 0809357..9f6b164 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -13,9 +13,12 @@
     // 鍗曟嵁缂栧彿
     private String orderNo;
 
-    // 鎵樼洏鏉$爜
+    // 璐ф灦鏉$爜
     private String barcode;
 
+    // 璐ф灦鏉$爜
+    private Short containerType;
+
     // 搴撲綅缂栧彿
     private String locno;
 

--
Gitblit v1.9.1