diff --git a/1231.txt b/1231.txt
new file mode 100644
index 0000000..fccf0f3
--- /dev/null
+++ b/1231.txt
@@ -0,0 +1,57 @@
+
+     {label: '店铺id',
+      prop: 'shopId',
+      search: true
+    },{label: '店铺名称',prop: 'shopName',
+      search: true
+    },{label: '店长用户id',prop: 'userId',
+      search: true
+    },{label: '店铺类型',prop: 'shopType',
+      search: true
+    },{label: '店铺简介',prop: 'intro',
+      search: true
+    },{label: '店铺公告',prop: 'shopNotice',
+      search: true
+    },{label: '店铺行业',prop: 'shopIndustry',
+      search: true
+    },{label: '店长',prop: 'shopOwner',
+      search: true
+    },{label: '店铺绑定的手机',prop: 'mobile',
+      search: true
+    },{label: '店铺联系电话',prop: 'tel',
+      search: true
+    },{label: '店铺所在纬度',prop: 'shopLat',
+      search: true
+    },{label: '店铺所在经度',prop: 'shopLng',
+      search: true
+    },{label: '店铺详细地址',prop: 'shopAddress',
+      search: true
+    },{label: '店铺所在省份',prop: 'province',
+      search: true
+    },{label: '店铺所在城市',prop: 'city',
+      search: true
+    },{label: '店铺所在区域',prop: 'area',
+      search: true
+    },{label: '店铺省市区代码',prop: 'pcaCode',
+      search: true
+    },{label: '店铺logo',prop: 'shopLogo',
+      search: true
+    },{label: '店铺相册',prop: 'shopPhotos',
+      search: true
+    },{label: '每天营业时间段',prop: 'openTime',
+      search: true
+    },{label: '店铺状态(-1:未开通 0: 停业中 1:营业中)',prop: 'shopStatus',
+      search: true
+    },{label: '0:商家承担运费 1:买家承担运费',prop: 'transportType',
+      search: true
+    },{label: '固定运费',prop: 'fixedFreight',
+      search: true
+    },{label: '满X包邮',prop: 'fullFreeShipping',
+      search: true
+    },{label: '创建时间',prop: 'createTime',
+      search: true
+    },{label: '更新时间',prop: 'updateTime',
+      search: true
+    },{label: '分销设置(0关闭 1开启)',prop: 'isDistribution',
+      search: true
+    }
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserPortfolioController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserPortfolioController.java
new file mode 100644
index 0000000..e553b0d
--- /dev/null
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserPortfolioController.java
@@ -0,0 +1,40 @@
+package com.yami.shop.admin.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yami.shop.bean.model.User;
+import com.yami.shop.bean.model.UserPortfolio;
+import com.yami.shop.common.response.ServerResponseEntity;
+import com.yami.shop.common.util.PageParam;
+import com.yami.shop.service.UserPortfolioService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/user/portfolio")
+public class UserPortfolioController {
+    @Autowired
+    private UserPortfolioService userPortfolioService;
+
+    @GetMapping("/page")
+    @PreAuthorize("@pms.hasPermission('user:userPortfolio:page')")
+    public ServerResponseEntity<IPage<UserPortfolio>> page(UserPortfolio userPortfolio, PageParam<UserPortfolio> page) {
+        IPage<UserPortfolio> userPortfolioIPage = userPortfolioService.page(page, new LambdaQueryWrapper<UserPortfolio>()
+                .like(StrUtil.isNotBlank(userPortfolio.getName()), UserPortfolio::getName, userPortfolio.getName()));
+
+        return ServerResponseEntity.success(userPortfolioIPage);
+    }
+    @GetMapping("/info/{portfolio}")
+    @PreAuthorize("@pms.hasPermission('user:userPortfolio:detail')")
+    public ServerResponseEntity<UserPortfolio>info(@PathVariable("portfolio") String portfolio) {
+        UserPortfolio userPortfolio =
+        userPortfolioService.getOne(new LambdaQueryWrapper<UserPortfolio>().eq(UserPortfolio::getPortfolioId, portfolio));
+        return ServerResponseEntity.success(userPortfolio);
+    }
+
+}
diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java
index 2543f37..c62c6ea 100644
--- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java
+++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserPortfolio.java
@@ -1,5 +1,6 @@
 package com.yami.shop.bean.model;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -9,6 +10,7 @@ import java.util.Date;
 @TableName("tz_user_portfolio")
 public class UserPortfolio {
     // 基本信息
+    @TableId
     private Integer portfolioId;   //档案id
     private Integer userId; // 会员ID
     private String name; // 姓名
@@ -49,4 +51,9 @@ public class UserPortfolio {
     private String preDeathAgentDesignation; // 生前事务代理人指定书
     private String medicalAgentDesignation; // 医疗事务代理人指定书
     private String lifeSupportDecision; // 生命维持治疗决定书
+    // 档案状态
+    private Integer portfolioStatus;
+    // 拒绝理由
+    private String rejectionReason;
+
 }
diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserPortfolioMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserPortfolioMapper.java
new file mode 100644
index 0000000..22d088b
--- /dev/null
+++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserPortfolioMapper.java
@@ -0,0 +1,8 @@
+package com.yami.shop.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yami.shop.bean.model.UserPortfolio;
+
+public interface UserPortfolioMapper extends BaseMapper<UserPortfolio> {
+
+}
diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserPortfolioService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserPortfolioService.java
new file mode 100644
index 0000000..b5544e7
--- /dev/null
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserPortfolioService.java
@@ -0,0 +1,8 @@
+package com.yami.shop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yami.shop.bean.model.User;
+import com.yami.shop.bean.model.UserPortfolio;
+
+public interface UserPortfolioService extends IService<UserPortfolio> {
+}
diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserPortfolioServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserPortfolioServiceImpl.java
new file mode 100644
index 0000000..8265773
--- /dev/null
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserPortfolioServiceImpl.java
@@ -0,0 +1,11 @@
+package com.yami.shop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yami.shop.bean.model.UserPortfolio;
+import com.yami.shop.dao.UserPortfolioMapper;
+import com.yami.shop.service.UserPortfolioService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserPortfolioServiceImpl extends ServiceImpl<UserPortfolioMapper, UserPortfolio> implements UserPortfolioService {
+}
diff --git a/yami-shop-service/src/main/resources/mapper/UserPortfolioMapper.xml b/yami-shop-service/src/main/resources/mapper/UserPortfolioMapper.xml
new file mode 100644
index 0000000..07d60df
--- /dev/null
+++ b/yami-shop-service/src/main/resources/mapper/UserPortfolioMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yami.shop.dao.UserPortfolioMapper">
+    <resultMap id="BaseResultMap" type="com.yami.shop.bean.model.UserPortfolio">
+        <!-- 基本信息 -->
+        <id property="portfolioId" column="portfolio_id" jdbcType="INTEGER"/>
+        <result property="userId" column="user_id" jdbcType="INTEGER"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="birthDate" column="birth_date" jdbcType="DATE"/>
+        <result property="gender" column="gender" jdbcType="VARCHAR"/>
+        <result property="ethnicity" column="ethnicity" jdbcType="VARCHAR"/>
+        <result property="nativePlace" column="native_place" jdbcType="VARCHAR"/>
+        <result property="idCardNumber" column="id_card_number" jdbcType="VARCHAR"/>
+
+        <!-- 联系信息 -->
+        <result property="address" column="address" jdbcType="VARCHAR"/>
+        <result property="phoneNumber" column="phone_number" jdbcType="VARCHAR"/>
+        <result property="emailAddress" column="email_address" jdbcType="VARCHAR"/>
+        <result property="emergencyContactName" column="emergency_contact_name" jdbcType="VARCHAR"/>
+        <result property="emergencyContactPhone" column="emergency_contact_phone" jdbcType="VARCHAR"/>
+
+        <!-- 健康信息 -->
+        <result property="healthStatus" column="health_status" jdbcType="VARCHAR"/>
+        <result property="medicalInsuranceInfo" column="medical_insurance_info" jdbcType="VARCHAR"/>
+        <result property="primaryDoctorContact" column="primary_doctor_contact" jdbcType="VARCHAR"/>
+        <result property="longTermMedicationInfo" column="long_term_medication_info" jdbcType="VARCHAR"/>
+
+        <!-- 预先规划的殡葬信息 -->
+        <result property="funeralMethod" column="funeral_method" jdbcType="VARCHAR"/>
+        <result property="ceremonyType" column="ceremony_type" jdbcType="VARCHAR"/>
+        <result property="cemeteryInfo" column="cemetery_info" jdbcType="VARCHAR"/>
+        <result property="prePurchasedGrave" column="pre_purchased_grave" jdbcType="BOOLEAN"/>
+        <result property="preReservedFuneralLocation" column="pre_reserved_funeral_location" jdbcType="VARCHAR"/>
+        <result property="hasWillOrLivingDirective" column="has_will_or_living_directive" jdbcType="BOOLEAN"/>
+
+        <!-- 财务信息 -->
+        <result property="paymentMethod" column="payment_method" jdbcType="VARCHAR"/>
+        <result property="bankAccountInfo" column="bank_account_info" jdbcType="VARCHAR"/>
+        <result property="prePaidFuneralCost" column="pre_paid_funeral_cost" jdbcType="DOUBLE"/>
+
+        <!-- 法律文件 -->
+        <result property="willCopy" column="will_copy" jdbcType="VARCHAR"/>
+        <result property="preDeathAgentDesignation" column="pre_death_agent_designation" jdbcType="VARCHAR"/>
+        <result property="medicalAgentDesignation" column="medical_agent_designation" jdbcType="VARCHAR"/>
+        <result property="lifeSupportDecision" column="life_support_decision" jdbcType="VARCHAR"/>
+        <result property="portfolioStatus" column="portfolio_status" jdbcType="INTEGER"/>
+        <result property="rejectionReason" column="rejection_reason" jdbcType="INTEGER"/>
+
+    </resultMap>
+
+
+</mapper>