From 0cba67398a247b8f1a6db09cc3aed26aff17dfc0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 08:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index f7f99ee..98733f8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -51,8 +51,9 @@
     ASSIGN_UUID(4), //鍏ㄥ眬鍞竴鐨� uuid
     */
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
-    @TableId(type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.INPUT)
     @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    //public Long userId;
     public Long id;
 
 
@@ -80,7 +81,7 @@
      * 瀵嗙爜锛屽瘑鐮佺殑MD5鍔犲瘑
      */
     @Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED)
-    @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
+    @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 5, max = 20)
     public String password;
 
     /**
@@ -133,6 +134,7 @@
     @JSONField(serialize = false)
     public List<Integer> privileges;
 
+
     /**
      * 鎵�灞炵墖鍖哄悕绉�
      */

--
Gitblit v1.8.0