From 298285bf63c0cec97fab0c64df4c010c5d2aebe6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 31 五月 2023 12:47:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 84a4927..3693711 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,11 +16,20 @@
     // 鎵樼洏鏉$爜
     private String barcode;
 
+    // 搴撲綅缂栧彿
+    private String locno;
+
+//    // 璐т富
+//    private int owner;
+
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
+        // 鍗曟嵁缂栧彿
+        private String orderNo;
+
         // 鐗╂枡缂栧彿
         private String matnr;
 

--
Gitblit v1.9.1