From 074c6c4389938fc38e82b6258b8ebab95fb5aff9 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java |   18 ++++++++++++++++++
 1 files changed, 18 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..a53e795 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java
@@ -30,6 +30,10 @@
     private String endReagentCode2;
     private String applyCode;
     private String orderCode;
+    //新增 货柜id
+    private String containerId;
+    private String userId;
+
 
     /**
      * 补贴条码的暂存领用数量
@@ -189,5 +193,19 @@
         this.useNum = useNum;
     }
 
+    public String getContainerId() {
+        return containerId;
+    }
 
+    public void setContainerId(String containerId) {
+        this.containerId = containerId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }

--
Gitblit v1.9.2