From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据,提交时如有无效试剂耗材报错

---
 src/main/java/com/nanometer/smartlab/entity/SysUser.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/SysUser.java b/src/main/java/com/nanometer/smartlab/entity/SysUser.java
index 78b79bb..30c124f 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysUser.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysUser.java
@@ -6,6 +6,7 @@
 import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
 import com.nanometer.smartlab.entity.enumtype.SeeFlag;
 import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.entity.enumtype.Waster;
 
 /**
  * Created by johnny on 17/11/18.
@@ -32,7 +33,8 @@
     private Timestamp updateTime;
     private String containerCodeList;
     private String roleName;
-    private String projectId;
+    private String project;
+    private Waster waster;
 
     public String getId() {
         return id;
@@ -49,7 +51,7 @@
 	public void setPoint(int point) {
 		this.point = point;
 	}
-	
+
     public String getArp() {
         return arp;
     }
@@ -194,12 +196,19 @@
         this.containerCodeList = containerCodeList;
     }
 
-    public String getProjectId() {
-        return projectId;
+    public String getProject() {
+        return project;
     }
 
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
+    public void setProject(String project) {
+        this.project = project;
     }
 
+    public Waster getWaster() {
+        return waster;
+    }
+
+    public void setWaster(Waster waster) {
+        this.waster = waster;
+    }
 }

--
Gitblit v1.9.2