diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java
index 58629208b..766ad30a5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/BaseBO.java
@@ -1,16 +1,11 @@
 package org.dromara.common.core.domain;
 
 
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Data;
-import org.dromara.common.core.domain.model.BaseAudit;
 
-import java.sql.Wrapper;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
 
 @Data
 public  class BaseBO <T> {
diff --git a/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageController.java b/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageController.java
index 2a6526d53..8922dad2a 100644
--- a/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageController.java
+++ b/ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageController.java
@@ -42,8 +42,8 @@ public class IMMessageController extends BaseController {
 //    @SaCheckPermission("system:message:list")
     @Operation(summary = "查询消息列表")
     @PostMapping("/page")
-    public R<Page<SysMessageVo>> list(@RequestBody SysMessageBo bo, Page page) {
-        Page<SysMessage> messagePage = messageService.page(page, bo.toWrapper());
+    public R<Page<SysMessageVo>> list(@RequestBody SysMessageBo bo) {
+        Page<SysMessage> messagePage = messageService.page(Page.of(bo.getCurrent(), bo.getSize()), bo.toWrapper());
         Page<SysMessageVo> voPage = new Page<>(messagePage.getCurrent(), messagePage.getSize(), messagePage.getTotal());
         voPage.setRecords(MapstructUtils.convert(messagePage.getRecords(), SysMessageVo.class));
         return R.ok(voPage);
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java
index a9f2c7733..d60bf1b0c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java
@@ -1,7 +1,6 @@
 package com.wzj.soopin.member.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wzj.soopin.member.convert.MemberAccountConvert;
 import com.wzj.soopin.member.domain.bo.MemberAccountBO;
 import com.wzj.soopin.member.domain.po.MemberAccount;
@@ -35,11 +34,8 @@ public class MemberAccountController {
 
     @Operation(summary = "查询会员账户表列表")
     @PostMapping("/list")
-    public R<IPage<MemberAccountVO>> list(@RequestBody MemberAccountBO bo,
-                                          @RequestParam(defaultValue = "1") int pageNum,
-                                          @RequestParam(defaultValue = "10") int pageSize) {
-        Page<MemberAccount> page = new Page<>(pageNum, pageSize);
-        IPage<MemberAccountVO> result = service.pageWithMember(page, bo);
+    public R<IPage<MemberAccountVO>> list(@RequestBody MemberAccountBO bo) {
+        IPage<MemberAccountVO> result = service.pageWithMember(bo);
         return R.ok(result);
     }
 
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberAccountService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberAccountService.java
index b1ba7c934..ea6127758 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberAccountService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberAccountService.java
@@ -1,21 +1,16 @@
 package com.wzj.soopin.member.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.wzj.soopin.member.domain.bo.MemberAccountBO;
 import com.wzj.soopin.member.domain.po.MemberAccount;
 import com.wzj.soopin.member.domain.vo.MemberAccountVO;
-import com.wzj.soopin.member.enums.AccountBillSourceEnum;
-import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
 
 public interface IMemberAccountService extends IService<MemberAccount> {
 
     MemberAccount getMemberAccount(Long memberId);
 
-    IPage<MemberAccountVO> pageWithMember(Page<?> page, MemberAccountBO bo);
+    IPage<MemberAccountVO> pageWithMember(MemberAccountBO bo);
 
     Object getCount();
 
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAccountServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAccountServiceImpl.java
index a5a6f3789..a39feec10 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAccountServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAccountServiceImpl.java
@@ -4,49 +4,42 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.wzj.soopin.member.domain.po.AccountBill;
-import com.wzj.soopin.member.domain.po.MemberAccount;
 import com.wzj.soopin.member.domain.bo.MemberAccountBO;
+import com.wzj.soopin.member.domain.po.MemberAccount;
 import com.wzj.soopin.member.domain.vo.MemberAccountVO;
-import com.wzj.soopin.member.enums.AccountBillChangeTypeEnum;
-import com.wzj.soopin.member.enums.AccountBillSourceEnum;
 import com.wzj.soopin.member.mapper.MemberAccountMapper;
 import com.wzj.soopin.member.service.IMemberAccountService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-
 /**
  * 会员账户表Service业务层处理
  *
- *
  * @author zcc
  */
 @Service
 @RequiredArgsConstructor
-public class MemberAccountServiceImpl extends ServiceImpl<MemberAccountMapper,MemberAccount> implements IMemberAccountService {
+public class MemberAccountServiceImpl extends ServiceImpl<MemberAccountMapper, MemberAccount> implements IMemberAccountService {
 
 
     @Override
     public MemberAccount getMemberAccount(Long memberId) {
-        return baseMapper.selectOne(new QueryWrapper<MemberAccount>().lambda().eq(MemberAccount::getMemberId,memberId));
+        return baseMapper.selectOne(new QueryWrapper<MemberAccount>().lambda().eq(MemberAccount::getMemberId, memberId));
     }
 
     /**
      * 查询会员账户表列表
      *
      * @param query 查询条件
-     * @param page 分页条件
      * @return 会员账户表
      */
-    public IPage<MemberAccount> selectList(MemberAccountBO query, IPage page) {
-        return baseMapper.selectPage(page,query.toWrapper());
+    public IPage<MemberAccount> selectList(MemberAccountBO query) {
+        return baseMapper.selectPage(Page.of(query.getCurrent(), query.getSize()), query.toWrapper());
     }
 
     @Override
-    public IPage<MemberAccountVO> pageWithMember(Page<?> page, MemberAccountBO bo) {
-        return baseMapper.selectAccountWithMember(page, bo);
+    public IPage<MemberAccountVO> pageWithMember(MemberAccountBO bo) {
+        return baseMapper.selectAccountWithMember(Page.of(bo.getCurrent(), bo.getSize()), bo);
     }
 
     @Override
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java
index 9e0f70b69..87cd6874c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java
@@ -5,7 +5,6 @@ import cn.dev33.satoken.annotation.SaCheckRole;
 import cn.dev33.satoken.annotation.SaMode;
 import com.baomidou.lock.annotation.Lock4j;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
@@ -22,7 +21,6 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.domain.SysTenant;
 import org.dromara.system.domain.bo.SysTenantBo;
 import org.dromara.system.domain.bo.SysTenantExtendBo;
 import org.dromara.system.domain.bo.SysTenantReviewBo;
@@ -57,8 +55,8 @@ public class SysTenantController extends BaseController {
 //    }, mode = SaMode.OR)
     @SaCheckPermission("system:tenant:list")
     @PostMapping("/list")
-    public R<IPage<TenantDTO>> list(@RequestBody SysTenantExtendBo query, Page<SysTenant> page){
-        return R.ok(tenantService.getlist(page,query));
+    public R<IPage<TenantDTO>> list(@RequestBody SysTenantExtendBo query){
+        return R.ok(tenantService.getlist(query));
     }
 
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java
index 107264c7a..46cc3c207 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java
@@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import org.dromara.common.core.domain.BaseBO;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
-public class SysTenantExtendBo {
+public class SysTenantExtendBo extends BaseBO {
 
     @Schema(description = "id")
     @TableId(value = "id")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java
index c112352bf..37c6597e7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java
@@ -1,7 +1,6 @@
 package org.dromara.system.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.system.domain.SysTenant;
@@ -93,7 +92,7 @@ public interface ISysTenantService {
      */
     void syncTenantDict();
 
-    IPage<TenantDTO> getlist(Page<SysTenant> page, SysTenantExtendBo query);
+    IPage<TenantDTO> getlist(SysTenantExtendBo query);
 
     List<TenantDTO> getAll(SysTenantBo bo);
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
index d95319f17..ca5474387 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
@@ -158,12 +158,12 @@ public class SysTenantServiceImpl implements ISysTenantService {
         tenant.setAgencyTenantId(currentTenantId);
         if (bo.getType() == TenantType.AGENT.getType()) {
             tenantName = bo.getAgencyName();
-        } else if (bo.getType() == TenantType.MERCHANT.getType()){
+        } else if (bo.getType() == TenantType.MERCHANT.getType()) {
             tenant.setPromoterTenantId(LoginHelper.getUserIdStr());
             tenantName = bo.getStoreName();
             nickName = bo.getContactUserName();
             phoneNumber = bo.getContactPhone();
-        } else if (bo.getType() == TenantType.REFERENCE.getType()){
+        } else if (bo.getType() == TenantType.REFERENCE.getType()) {
             tenant.setPromoterTenantId(LoginHelper.getUserIdStr());
             tenantName = bo.getPersonName();
             nickName = bo.getPersonName();
@@ -499,7 +499,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         existingExtend.setSigner(bo.getSigner());
         existingExtend.setContractYear(bo.getContractYear());
         existingExtend.setContractAttachment(bo.getContractAttachment());
-        existingExtend.setSignStatus(bo.getSignStatus()==null?"0":bo.getSignStatus());
+        existingExtend.setSignStatus(bo.getSignStatus() == null ? "0" : bo.getSignStatus());
         existingExtend.setPayeeName(bo.getPayeeName());
         existingExtend.setEmergencyContact(bo.getEmergencyContact());
         existingExtend.setEmergencyContactPhone(bo.getEmergencyContactPhone());
@@ -732,11 +732,11 @@ public class SysTenantServiceImpl implements ISysTenantService {
     }
 
     @Override
-    public IPage<TenantDTO> getlist(Page<SysTenant> page, SysTenantExtendBo query) {
+    public IPage<TenantDTO> getlist(SysTenantExtendBo query) {
         SysTenantVo sysTenantVo = queryByTenantId(TenantHelper.getTenantId());
         query.setOneParentId(sysTenantVo.getId());
-        IPage<TenantDTO> resultPage = baseMapper.getlist(page,query);
-        return  resultPage;
+        IPage<TenantDTO> resultPage = baseMapper.getlist(Page.of(query.getCurrent(), query.getSize()), query);
+        return resultPage;
     }
 
     @Override
@@ -801,7 +801,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
         updateTenantExtend.setId(tenantExtend.getId());
         if (isPass) {
             updateTenantExtend.setSignStatus(TenantSignStatus.TO_BE_CONFIRMED.getStatus());
-        }else{
+        } else {
             updateTenantExtend.setSignStatus(TenantSignStatus.TO_BE_SUBMITTED.getStatus());
             updateTenantExtend.setFailureReason(bo.getFailureReason());
         }
@@ -840,8 +840,8 @@ public class SysTenantServiceImpl implements ISysTenantService {
     public IPage<SysReferenceVO> getReferenceList(SysReferenceBo query) {
         SysTenantVo sysTenantVo = queryByTenantId(TenantHelper.getTenantId());
         query.setOneParentId(sysTenantVo.getId());
-        IPage<SysReferenceVO> resultPage = baseMapper.getReferenceList(Page.of(query.getCurrent(), query.getSize()),query);
-        return  resultPage;
+        IPage<SysReferenceVO> resultPage = baseMapper.getReferenceList(Page.of(query.getCurrent(), query.getSize()), query);
+        return resultPage;
     }
 
 }