diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
index b239707..4a2a4f9 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.xq.domain.User;
 import com.ruoyi.xq.domain.UserPictures;
 import com.ruoyi.xq.dto.admin.common.AuditFailReq;
+import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
 import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
 import com.ruoyi.xq.dto.app.common.IdsReq;
 import com.ruoyi.xq.enums.common.AuditEnum;
@@ -54,6 +55,13 @@ public class UserPicturesController extends BaseController {
         return TableDataInfo.build(page);
     }
 
+    @SaCheckPermission("xq:userPictures:merge")
+    @GetMapping("/list/merge")
+    public TableDataInfo<UserPicturesAdminMergeVo> listMerge(UserPicturesAdminMergeVo bo, PageQuery pageQuery) {
+        Page<UserPicturesAdminMergeVo> page = userPicturesService.pageAdminManager(pageQuery, bo);
+        return TableDataInfo.build(page);
+    }
+
     /**
      * 获取用户相册管理详细信息
      *
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminMergeVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminMergeVo.java
new file mode 100644
index 0000000..dba7fbc
--- /dev/null
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminMergeVo.java
@@ -0,0 +1,17 @@
+package com.ruoyi.xq.dto.admin.user;
+
+import com.ruoyi.xq.domain.UserPictures;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UserPicturesAdminMergeVo implements Serializable {
+    private Long userId;
+    private String usercode;
+    private String nickname;
+    private String mobile;
+    private String avatar;
+    private List<UserPictures> userPictureList;
+}
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminVo.java
index d6d67c1..fbfa1c0 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminVo.java
@@ -7,6 +7,5 @@ import lombok.Data;
 public class UserPicturesAdminVo extends UserPictures {
     private String nickname;
     private String mobile;
-
     private String avatar;
 }
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 17210c2..55adc43 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
@@ -103,6 +103,7 @@ public class CurrentUserManager {
         vo.setBirthday(user.getBirthday());
         vo.setAge(AgeUtil.getAge(user.getBirthday()));
         vo.setResidenceCityName(user.getResidenceCityName());
+        vo.setResidenceCityCode(user.getResidenceCityCode());
         vo.setResidenceCode(user.getResidenceCode());
         vo.setResidenceName(user.getResidenceName());
         vo.setAddressCode(user.getAddressCode());
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserPicturesMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserPicturesMapper.java
index 8eb6ab0..530fd0e 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserPicturesMapper.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserPicturesMapper.java
@@ -3,6 +3,7 @@ package com.ruoyi.xq.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.xq.domain.UserPictures;
+import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
 import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
 public interface UserPicturesMapper extends BaseMapper<UserPictures> {
 
     Page<UserPicturesAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserPicturesAdminVo bo);
+
+    Page<UserPicturesAdminMergeVo> pageAdminManager(@Param("build") Page<Object> build, @Param("bo") UserPicturesAdminMergeVo bo);
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
index d8b42b1..0926dca 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.xq.domain.User;
 import com.ruoyi.xq.domain.UserPictures;
+import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
 import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
 
 import java.util.List;
@@ -30,4 +31,6 @@ public interface UserPicturesService extends IService<UserPictures>  {
     void auditFail(Long id,String auditRemark);
 
     void addPictures(List<String> picturesList, User user);
+
+    Page<UserPicturesAdminMergeVo> pageAdminManager(PageQuery pageQuery, UserPicturesAdminMergeVo bo);
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
index 0d71113..bce7d98 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
@@ -8,16 +8,20 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.xq.domain.User;
 import com.ruoyi.xq.domain.UserPictures;
+import com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo;
 import com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo;
 import com.ruoyi.xq.enums.common.AuditEnum;
 import com.ruoyi.xq.mapper.UserPicturesMapper;
 import com.ruoyi.xq.service.UserPicturesService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 用户相册管理Service业务层处理
@@ -53,6 +57,23 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
         return baseMapper.pageAdmin(pageQuery.build(),bo);
     }
 
+    @Override
+    public Page<UserPicturesAdminMergeVo> pageAdminManager(PageQuery pageQuery, UserPicturesAdminMergeVo bo) {
+        Page<UserPicturesAdminMergeVo> page = baseMapper.pageAdminManager(pageQuery.build(), bo);
+        List<UserPicturesAdminMergeVo> records = page.getRecords();
+        if(CollectionUtils.isEmpty(records)){
+            return page;
+        }
+        List<Long> userIds = records.stream().map(UserPicturesAdminMergeVo::getUserId).collect(Collectors.toList());
+        List<UserPictures> list = this.list(Wrappers.lambdaQuery(UserPictures.class)
+                .in(UserPictures::getUserId, userIds));
+        Map<Long, List<UserPictures>> userIdPictursMap = list.stream().collect(Collectors.groupingBy(UserPictures::getUserId));
+        for (UserPicturesAdminMergeVo record : records) {
+            record.setUserPictureList(userIdPictursMap.getOrDefault(record.getUserId(), Collections.emptyList()));
+        }
+        return page;
+    }
+
     @Override
     public void auditSuccess(String ids) {
         String[] idArray = ids.split(",");
@@ -94,4 +115,6 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
             this.save(userPictures);
         }
     }
+
+
 }
diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml
index a24d05a..bacd481 100644
--- a/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml
+++ b/ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml
@@ -3,6 +3,20 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.xq.mapper.UserPicturesMapper">
+
+    <resultMap id="userPicturesAdminMergeVo" type="com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo">
+        <id property="userId" column="user_id"/>
+        <result property="usercode" column="usercode"/>
+        <result property="nickname" column="nickname"/>
+        <result property="mobile" column="mobile"/>
+        <result property="avatar" column="avatar"/>
+        <collection property="userPictureList" ofType="com.ruoyi.xq.domain.UserPictures">
+            <id property="id" column="id"/>
+            <result property="picture" column="picture"/>
+            <result property="auditStatus" column="audit_status"/>
+        </collection>
+    </resultMap>
+
     <select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo">
         select t1.*, t2.nickname, t2.mobile,t2.avatar
         from xq_user_pictures t1
@@ -20,6 +34,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
+    <select id="pageAdminManager" resultType="com.ruoyi.xq.dto.admin.user.UserPicturesAdminMergeVo">
+        select t1.id as user_id, t1.usercode,t1.nickname, t1.mobile,t1.avatar
+        from xq_user t1
+        <where>
+            <if test="bo.usercode != null and bo.usercode != ''">
+                and t1.usercode = #{bo.usercode}
+            </if>
+            <if test="bo.nickname != null and bo.nickname != ''">
+                and t1.nickname like concat('%',#{bo.nickname},'%')
+            </if>
+            <if test="bo.mobile != null and bo.mobile != ''">
+                and t1.mobile = #{bo.mobile}
+            </if>
+        </where>
+        order by t1.update_time desc
+    </select>
 
 
 </mapper>