From e8a72ebe25e054107b76bde858ae970e24c94cf0 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 18 十月 2024 16:23:47 +0800
Subject: [PATCH] command

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
index 4fefbde..1ca919a 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
@@ -2,15 +2,14 @@
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-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.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -60,8 +59,9 @@
     /**
      * 瀵嗙爜,MD5鍔犲瘑
      */
-    @NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+//    @NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
     @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
+    @JSONField(serialize = false)
     public String password;
 
     /**
@@ -78,11 +78,24 @@
     /**
      * 鍒犻櫎鏍囧織锛�1鏄紝0鍚�
      */
+    @JSONField(serialize = false)
     public Boolean deleted;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField(value = "dt", fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date dt;
 
     //////////////////////////////////////
     // 浠ヤ笅涓嶆槸鏁版嵁搴撳疄浣撳睘鎬�
     //////////////////////////////////////
+    /**
+     * 浜岀淮鐮�
+     */
+    @TableField(exist = false)
+    public String qrCode;
     /**
      * 鐢ㄦ埛鎵�鍏宠仈鐨勮鑹查泦鍚�
      */
@@ -93,6 +106,7 @@
      * 鍓嶇web鐣岄潰鎻愪氦鐨勭敤鎴锋墍灞炶鑹茬殑id锛屽叾鏄竴涓瓧绗︿覆鏁扮粍
      */
     @TableField(exist = false)
+    @JSONField(serialize = false)
     public String[] roleIds ;
 
     /**

--
Gitblit v1.8.0