From c3ef548aa36678645b3860c0cf9a0283a97efb92 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 14 九月 2024 15:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java | 2 +-
pms-parent/pms-common/pom说明.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git "a/pms-parent/pms-common/pom\350\257\264\346\230\216.txt" "b/pms-parent/pms-common/pom\350\257\264\346\230\216.txt"
index 800fe15..c0f5850 100644
--- "a/pms-parent/pms-common/pom\350\257\264\346\230\216.txt"
+++ "b/pms-parent/pms-common/pom\350\257\264\346\230\216.txt"
@@ -1 +1 @@
-pms-common鐨刾om鎾戠鎵�鏈塸ms-*鐨勬ā鍧楃殑pom鐨勪緷璧�
\ No newline at end of file
+pms-common鐨刾om鎺岀鎵�鏈塸ms-*鐨勬ā鍧楃殑pom鐨勪緷璧�
\ No newline at end of file
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 5ed862b..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
@@ -59,7 +59,7 @@
/**
* 瀵嗙爜,MD5鍔犲瘑
*/
- @NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+// @NotEmpty(message = "瀵嗙爜涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
@JSONField(serialize = false)
public String password;
--
Gitblit v1.8.0