From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc

---
 src/main/java/org/springblade/modules/system/vo/UserVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 56e219f..3471041 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -23,6 +23,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserDetailEntity;
 
 /**
  * 视图实体类
@@ -174,4 +175,9 @@
 	 * 年龄段类型 1：18-30周岁  2：30-45周岁  3：45-60周岁  4：全部
 	 */
 	private Integer ageType;
+
+	/**
+	 * 用户详情
+	 */
+	private UserDetailEntity userDetail = new UserDetailEntity();
 }

--
Gitblit v1.9.3