From 3ec412f3cdc8b114cf629e866a7b7b80687a3442 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 10:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
index 2262797..c9e9a18 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
@@ -31,6 +31,10 @@
private Integer flag;
private ApplyStatus status;
+ private Integer arrivalNum;
+ private String containerId;
+ private String houseId;
+ private Timestamp arrivalTime;
private String project;
private String projectManage;
@@ -169,19 +173,51 @@
this.selectNum = selectNum;
}
- public String getProject() {
- return project;
+ public Integer getArrivalNum() {
+ return arrivalNum;
}
- public void setProject(String project) {
- this.project = project;
+ public void setArrivalNum(Integer arrivalNum) {
+ this.arrivalNum = arrivalNum;
}
- public String getProjectManage() {
- return projectManage;
+ public String getContainerId() {
+ return containerId;
}
- public void setProjectManage(String projectManage) {
- this.projectManage = projectManage;
+ public void setContainerId(String containerId) {
+ this.containerId = containerId;
}
+
+ public String getHouseId() {
+ return houseId;
+ }
+
+ public void setHouseId(String houseId) {
+ this.houseId = houseId;
+ }
+
+ public Timestamp getArrivalTime() {
+ return arrivalTime;
+ }
+
+ public void setArrivalTime(Timestamp arrivalTime) {
+ this.arrivalTime = arrivalTime;
+ }
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getProjectManage() {
+ return projectManage;
+ }
+
+ public void setProjectManage(String projectManage) {
+ this.projectManage = projectManage;
+ }
}
--
Gitblit v1.9.2