From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java b/src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java
index 8741a4c..0dc5902 100644
--- a/src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java
@@ -3,12 +3,16 @@
import java.io.Serializable;
public class HazardousWasteUser implements Serializable {
-
private String id;
private String account;
+ private String name;
private String password;
- private String roleName;
-
+ /**1危废处理人员 2危废管理员**/
+ private int adminFlag;
+ private String project;
+ private String department;
+ private String company;
+ private String newpassword;
public String getAccount() {
return account;
@@ -34,11 +38,51 @@
this.id = id;
}
- public String getRoleName() {
- return roleName;
+ public int getAdminFlag() {
+ return adminFlag;
}
- public void setRoleName(String roleName) {
- this.roleName = roleName;
+ public void setAdminFlag(int adminFlag) {
+ this.adminFlag = adminFlag;
+ }
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(String department) {
+ this.department = department;
+ }
+
+ public String getCompany() {
+ return company;
+ }
+
+ public void setCompany(String company) {
+ this.company = company;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getNewpassword() {
+ return newpassword;
+ }
+
+ public void setNewpassword(String newpassword) {
+ this.newpassword = newpassword;
}
}
--
Gitblit v1.9.2