From a36a33fe9b9af48b3f03b7a6a19e622c8f3d376c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 27 六月 2024 17:59:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
index e241856..30fa851 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/pagemodel/SmUserVO.java
@@ -1,4 +1,5 @@
package com.vci.frameworkcore.pagemodel;
+import com.vci.common.annotaion.CustomAnnotaion;
import com.vci.starter.web.pagemodel.BaseModelVO;
import java.util.Date;
@@ -23,7 +24,6 @@
* 鐢ㄦ埛濮撳悕
*/
private String name;
-
/**
* 鐢ㄦ埛绫诲瀷
@@ -111,6 +111,11 @@
private Date lastModifyPasswordTime;
/**
+ * 鐢ㄦ埛瀵嗙爜
+ */
+ private String password;
+
+ /**
* 瀵嗙爜閿欒娆℃暟
*/
private Integer pwdWrongCount;
@@ -118,7 +123,6 @@
/**
* 鎬у埆
*/
-
private String sex;
/**
@@ -147,9 +151,43 @@
private String photo;
/**
- * token鍊�
+ * 鏄惁鏄儴闂ㄩ瀵兼爣璇� 1锛氭槸 0锛氫笉鏄�
*/
- private String token;
+ private String isDeptLeader = "0";
+
+ /**
+ * 涓撲笟
+ */
+ private String specialties;
+
+ /**
+ * 鐘舵��
+ */
+ private short status;
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public void setStatus(short status) {
+ this.status = status;
+ }
+
+ public short getStatus() {
+ return status;
+ }
+
+ public void setSpecialties(String specialties) {
+ this.specialties = specialties;
+ }
+
+ public String getSpecialties() {
+ return specialties;
+ }
@Override
public String getId() {
@@ -362,12 +400,12 @@
this.photo = photo;
}
- public String getToken() {
- return token;
+ public void setIsDeptLeader(String isDeptLeader) {
+ this.isDeptLeader = isDeptLeader;
}
- public void setToken(String token) {
- this.token = token;
+ public String getIsDeptLeader() {
+ return isDeptLeader;
}
@Override
@@ -399,7 +437,6 @@
", langCodeText='" + langCodeText + '\'' +
", lockFlag=" + lockFlag +
", photo='" + photo + '\'' +
- ", token='" + token + '\'' +
'}';
}
}
--
Gitblit v1.9.3