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/TMerchantService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TMerchantService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TMerchantService.java
index f331a7b..a387d7a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TMerchantService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TMerchantService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TMerchant;
import com.ruoyi.system.query.TMerchantQuery;
+import com.ruoyi.system.vo.TMerchantVO;
/**
* <p>
@@ -27,5 +28,5 @@
* @param query
* @return
*/
- PageInfo<TMerchant> pageList(TMerchantQuery query);
+ PageInfo<TMerchantVO> pageList(TMerchantQuery query);
}
--
Gitblit v1.7.1