From a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Wed, 03 Feb 2021 16:10:36 +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