From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/User.java | 165 ++++--------------------------------------------------
1 files changed, 13 insertions(+), 152 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/User.java b/src/main/java/com/mindskip/xzs/domain/User.java
index cce1041..1000226 100644
--- a/src/main/java/com/mindskip/xzs/domain/User.java
+++ b/src/main/java/com/mindskip/xzs/domain/User.java
@@ -1,8 +1,12 @@
package com.mindskip.xzs.domain;
+import com.mindskip.xzs.domain.enums.UserConditionEnum;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
+@Data
public class User implements Serializable {
private static final long serialVersionUID = -7797183521247423117L;
@@ -61,7 +65,7 @@
private Date lastActiveTime;
/**
- * 鏄惁鍒犻櫎
+ * 鏄惁鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎
*/
private Boolean deleted;
@@ -69,157 +73,14 @@
* 寰俊openId
*/
private String wxOpenId;
- private String deptIds;
- public Integer getId() {
- return id;
- }
+ /**
+ * 鏄惁閮ㄩ棬绠＄悊鍛�
+ */
+ private String deptAdmin;
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getUserUuid() {
- return userUuid;
- }
-
- public void setUserUuid(String userUuid) {
- this.userUuid = userUuid == null ? null : userUuid.trim();
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName == null ? null : userName.trim();
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password == null ? null : password.trim();
- }
-
- public String getRealName() {
- return realName;
- }
-
- public void setRealName(String realName) {
- this.realName = realName == null ? null : realName.trim();
- }
-
- public Integer getAge() {
- return age;
- }
-
- public void setAge(Integer age) {
- this.age = age;
- }
-
- public Integer getSex() {
- return sex;
- }
-
- public void setSex(Integer sex) {
- this.sex = sex;
- }
-
- public Date getBirthDay() {
- return birthDay;
- }
-
- public void setBirthDay(Date birthDay) {
- this.birthDay = birthDay;
- }
-
- public Integer getUserLevel() {
- return userLevel;
- }
-
- public void setUserLevel(Integer userLevel) {
- this.userLevel = userLevel;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone == null ? null : phone.trim();
- }
-
- public Integer getRole() {
- return role;
- }
-
- public void setRole(Integer role) {
- this.role = role;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getImagePath() {
- return imagePath;
- }
-
- public void setImagePath(String imagePath) {
- this.imagePath = imagePath == null ? null : imagePath.trim();
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getModifyTime() {
- return modifyTime;
- }
-
- public void setModifyTime(Date modifyTime) {
- this.modifyTime = modifyTime;
- }
-
- public Date getLastActiveTime() {
- return lastActiveTime;
- }
-
- public void setLastActiveTime(Date lastActiveTime) {
- this.lastActiveTime = lastActiveTime;
- }
-
- public Boolean getDeleted() {
- return deleted;
- }
-
- public void setDeleted(Boolean deleted) {
- this.deleted = deleted;
- }
-
- public String getWxOpenId() {
- return wxOpenId;
- }
-
- public void setWxOpenId(String wxOpenId) {
- this.wxOpenId = wxOpenId == null ? null : wxOpenId.trim();
- }
-
- public String getDeptIds() {
- return deptIds;
- }
-
- public void setDeptIds(String deptIds) {
- this.deptIds = deptIds;
- }
+ /**
+ * 鐘跺喌
+ */
+ private UserConditionEnum condition;
}
--
Gitblit v1.8.0