From 3df973e4692f3634d9676e737a2d09214b77e7d1 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 30 Apr 2024 01:43:12 +0800
Subject: [PATCH] init

---
 .../java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java    | 2 ++
 .../src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
index 724e755..cf0da3d 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
@@ -109,6 +109,8 @@ public class CurrentUserInfoVo {
      */
     @Schema(description = "民族")
     private String nation;
+    @Schema(description = "婚况")
+    private Integer marriage;
     /**
      * 相册
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
index 505c9fd..b2f98dd 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
@@ -112,6 +112,7 @@ public class CurrentUserManager {
         vo.setBaseStep(user.getBaseStep());
         vo.setImToken(user.getImToken());
         vo.setWxCode(user.getWxCode());
+        vo.setMarriage(user.getMarriage());
         UserAuth userAuth = userAuthService.getByUserId(userId);
         vo.setAlreadyAuthNum(userAuth.getAlreadyAuthNum());
         List<UserPictures> userPictures = userPicturesService.listByUserIdAuditingAndSuccess(user.getId());