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 |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 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 8321e6c..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 {
 
@@ -115,4 +119,35 @@
 	 */
 	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