From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/java/com/nanometer/smartlab/entity/SysUser.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysUser.java b/src/main/java/com/nanometer/smartlab/entity/SysUser.java
index 3e27027..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,8 +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;
@@ -50,7 +51,7 @@
public void setPoint(int point) {
this.point = point;
}
-
+
public String getArp() {
return arp;
}
@@ -195,14 +196,6 @@
this.containerCodeList = containerCodeList;
}
- public String getProjectId() {
- return projectId;
- }
-
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
-
public String getProject() {
return project;
}
@@ -210,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