From 6704225b102b684e6ce4e88fa897414fac06c9f1 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 26 四月 2021 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   11 +++++++++++
 1 files changed, 11 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 3847ad6..86d30fa 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -15,8 +15,19 @@
     // 鎴愬搧鐮�
     private String productCode;
 
+    // 鐢熶骇鍗曞彿
+    private String warehouse;
+
     private String billNo;
 
+    public String getWarehouse() {
+        return warehouse;
+    }
+
+    public void setWarehouse(String warehouse) {
+        this.warehouse = warehouse;
+    }
+
     public static class CombMat {
 
         // 鐗╂枡缂栧彿

--
Gitblit v1.9.1