From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
index 84f2322..5fcd8a3 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
@@ -30,6 +30,9 @@
     private String endReagentCode2;
     private String applyCode;
     private String orderCode;
+    //新增 货柜id
+    private String containerId;
+
 
     /**
      * 补贴条码的暂存领用数量
@@ -189,5 +192,11 @@
         this.useNum = useNum;
     }
 
+    public String getContainerId() {
+        return containerId;
+    }
 
+    public void setContainerId(String containerId) {
+        this.containerId = containerId;
+    }
 }

--
Gitblit v1.9.2