diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java
index ce89ae05..c560d422 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java
@@ -1,9 +1,13 @@
 package com.ruoyi.web.controller.app;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdcardUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.system.domain.TbUserImg;
 import com.ruoyi.system.domain.TbUserSingle;
+import com.ruoyi.system.service.ITbUserImgService;
 import com.ruoyi.system.service.ITbUserSingleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,6 +30,9 @@ public class TbUserSingleAppController {
     @Autowired
     private ITbUserSingleService tbUserSingleService;
 
+    @Autowired
+    private ITbUserImgService tbUserImgService;
+
     @ResponseBody
     @PostMapping("/add")
     @ApiOperation(value = "填写用户信息", httpMethod = "POST")
@@ -45,6 +52,12 @@ public class TbUserSingleAppController {
     public Result<TbUserSingle> getByUserId(@RequestBody TbUserSingle tbUserSingle)
     {
         TbUserSingle userSingle = tbUserSingleService.lambdaQuery().eq(TbUserSingle::getUserId, tbUserSingle.getUserId()).one();
+        if(userSingle != null){
+            if(userSingle.getBirthday() != null){
+                userSingle.setAge(DateUtil.ageOfNow(userSingle.getBirthday()));
+            }
+            userSingle.setTbUserImgList(tbUserImgService.lambdaQuery().eq(TbUserImg::getUserId, userSingle.getUserId()).list());
+        }
         return Result.success(userSingle);
     }
 
@@ -72,6 +85,12 @@ public class TbUserSingleAppController {
                                                     @RequestParam("pageSize") int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<TbUserSingle> list = tbUserSingleService.selectTbUserSingleList(tbUserSingle);
+        list.forEach(model->{
+            if(model.getBirthday() != null){
+                model.setAge(DateUtil.ageOfNow(model.getBirthday()));
+            }
+            model.setTbUserImgList(tbUserImgService.lambdaQuery().eq(TbUserImg::getUserId, model.getUserId()).list());
+        });
         return Result.success(PageInfo.of(list));
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java
index c8467e8d..6d575786 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java
@@ -1,6 +1,9 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -54,6 +57,10 @@ public class TbUserSingle extends BaseEntity
     @ApiModelProperty(value = "出生年月")
     private Date birthday;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
     /** 身高(单位cm) */
     @Excel(name = "身高(单位cm)")
     @ApiModelProperty(value = "身高(单位cm)")
@@ -134,4 +141,8 @@ public class TbUserSingle extends BaseEntity
     @ApiModelProperty(value = "择偶标准")
     private String choosingStandard;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "用户各图片附件信息")
+    private List<TbUserImg> tbUserImgList;
+
 }