From 277a6ddb4790634f6d6885380c16b0564a301061 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 15 十一月 2025 14:04:06 +0800
Subject: [PATCH] 社区活动报名导出
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java
index 92fd3eb..eb2a8ab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java
@@ -9,6 +9,7 @@
import com.ruoyi.system.model.TMerchant;
import com.ruoyi.system.query.TMerchantQuery;
import com.ruoyi.system.service.TMerchantService;
+import com.ruoyi.system.vo.TMerchantVO;
import com.ruoyi.system.vo.TPartyBuildingVO;
import org.springframework.stereotype.Service;
@@ -37,9 +38,9 @@
}
@Override
- public PageInfo<TMerchant> pageList(TMerchantQuery query) {
- PageInfo<TMerchant> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<TMerchant> list = this.baseMapper.pageList(query,pageInfo);
+ public PageInfo<TMerchantVO> pageList(TMerchantQuery query) {
+ PageInfo<TMerchantVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TMerchantVO> list = this.baseMapper.pageList(query,pageInfo);
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1