From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/entity/SysUser.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysUser.java b/src/main/java/com/nanometer/smartlab/entity/SysUser.java
index 9c29553..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.
@@ -33,6 +34,7 @@
private String containerCodeList;
private String roleName;
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;
}
@@ -201,4 +203,12 @@
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