From fe81eb39c7402082f54e6aaee491efbcbb1aa50a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 13:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/vo/UserVO.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index d2485f3..0afc858 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -41,11 +41,8 @@
 	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
-	/**
-	 * 密码
-	 */
-	@JsonIgnore
-	private String password;
+
+	private String password2;
 
 	/**
 	 * 租户名

--
Gitblit v1.9.3