From 93c7226d536d312fc083a57619629192ba076413 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 01 十二月 2023 12:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
index 7c5ecc7..4dc9ca2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/entity/User.java
@@ -18,8 +18,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
import org.springblade.core.tenant.mp.TenantEntity;
import java.util.Date;
@@ -31,6 +33,8 @@
*/
@Data
@TableName("pl_org_user")
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class User extends TenantEntity {
@@ -89,6 +93,11 @@
*/
private String deptId;
/**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @TableField(exist = false)
+ private String deptName;
+ /**
* 瀵嗙爜绛栫暐
*/
@TableField(exist = false)
@@ -104,10 +113,41 @@
/**
* 鐢ㄦ埛瀵嗙骇
*/
- private String secretgrade;
+ private String secretGrade;
/**
* 瀵嗙爜绛栫暐淇敼鐘舵��
*/
private Long strategyUpdateStatus;
+ /**
+ * 璐﹀彿鏄惁鍋滅敤 0涓哄惎鐢紝1涓哄仠鐢�
+ */
+ private Integer userStatus;
+
+ public User(Integer userType, String account, String password, String name, String realName, Integer userStatus) {
+ this.userType = userType;
+ this.account = account;
+ this.password = password;
+ this.name = name;
+ this.realName = realName;
+ this.userStatus = userStatus;
+ }
+
+ @Override
+ public String toString() {
+ return "鍩烘湰淇℃伅:{" +
+ "鐢ㄦ埛缂栧彿='" + code + '\'' +
+ ", 鐢ㄦ埛骞冲彴=" + userType +
+ ", 璐﹀彿='" + account + '\'' +
+ ", 鏄电О='" + name + '\'' +
+ ", 鐪熷悕='" + realName + '\'' +
+ ", 閭='" + email + '\'' +
+ ", 鐢佃瘽='" + phone + '\'' +
+ ", 鐢熸棩=" + birthday +
+ ", 鎬у埆=" + sex +
+ ", 瀵嗙骇='" + secretGrade + '\'' +
+ ", 鐢ㄦ埛鐘舵��=" + userStatus +
+ '}';
+ }
+
}
--
Gitblit v1.9.3