From 178788d231d7d891c1874635b8e11dd951fc4230 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 六月 2021 18:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
index 389d25d..20d23da 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java
@@ -39,6 +39,7 @@
private String project;
private String projectManage;
+ private String applyUser;
public ApplyStatus getStatus() {
return status;
@@ -231,4 +232,12 @@
public void setCacheUpdateList(List<OpeWarehouseReserve> cacheUpdateList) {
this.cacheUpdateList = cacheUpdateList;
}
+
+ public String getApplyUser() {
+ return applyUser;
+ }
+
+ public void setApplyUser(String applyUser) {
+ this.applyUser = applyUser;
+ }
}
--
Gitblit v1.9.2