From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/system/vo/UserVO.java |   11 ++++++-----
 1 files changed, 6 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 3552e8e..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;
 
 	/**
 	 * 租户名
@@ -81,4 +78,8 @@
 	 * 拓展信息
 	 */
 	private String userExt;
+
+	private String userId;
+
+	private String distictName;
 }

--
Gitblit v1.9.3