From 5db28c7f1e8d0e0b1b4477ee3fa8ae4328af6718 Mon Sep 17 00:00:00 2001
From: GPU is all you need <2778335106@qq.com>
Date: Thu, 19 May 2022 20:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=BC=80=E5=A7=8B=E6=B2=A1=E6=87=82?=
 =?UTF-8?q?=E8=80=81=E5=B8=88=E9=82=A3=E4=B8=AAmybatis=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=8C=E7=84=B6=E5=90=8E=E5=B0=B1?=
 =?UTF-8?q?=E7=94=A8=E8=87=AA=E5=B7=B1=E7=9A=84=E4=BA=86=EF=BC=8C=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E6=87=92=E5=BE=97=E6=94=B9=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/edu/ncst/award/model/system/User.java  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/awardBE/src/main/java/edu/ncst/award/model/system/User.java b/awardBE/src/main/java/edu/ncst/award/model/system/User.java
index 9e05a21..f8391b6 100644
--- a/awardBE/src/main/java/edu/ncst/award/model/system/User.java
+++ b/awardBE/src/main/java/edu/ncst/award/model/system/User.java
@@ -1,9 +1,6 @@
 package edu.ncst.award.model.system;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import edu.ncst.award.common.constant.UserConstants;
 import edu.ncst.award.model.BaseEntity;
@@ -154,6 +151,18 @@ public class User extends BaseEntity implements Serializable, UserDetails {
     @TableField("enable")
     private String enable;
 
+    @ApiModelProperty(value = "是否删除 2：删除 0：未删除")
+    @TableField("del_flag")
+    @TableLogic
+    private String delFlag;
+
+    public User() {
+    }
+
+    public User(Long userId) {
+        this.id = userId;
+    }
+
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {