From 843c50e9c2b35196f5f4c150e33fdc6f6c2d6826 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 09:34:31 +0800
Subject: [PATCH] 测试节点通过后,状态取上一节点状态,而不是默认完成
---
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 434c5f7..5ed862b 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;
/**
@@ -47,7 +46,7 @@
* 濮撳悕
*/
@NotEmpty(message = "濮撳悕涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
+ @Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 50)
public String name;
/**
@@ -62,6 +61,7 @@
*/
@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