From dec2234ff37237d6ffd7bb936c9756cff8a8e674 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 15 十一月 2025 17:42:57 +0800
Subject: [PATCH] 修改异常
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
index 0a96087..f2b8498 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
@@ -24,6 +24,7 @@
import com.ruoyi.system.query.TMerchantQuery;
import com.ruoyi.system.service.TMerchantService;
import com.ruoyi.system.service.TMerchantTypeService;
+import com.ruoyi.system.vo.TMerchantVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -76,7 +77,7 @@
*/
@ApiOperation(value = "获取商户信息管理分页列表")
@PostMapping(value = "/pageList")
- public R<PageInfo<TMerchant>> pageList(@RequestBody TMerchantQuery query) {
+ public R<PageInfo<TMerchantVO>> pageList(@RequestBody TMerchantQuery query) {
return R.ok(merchantService.pageList(query));
}
--
Gitblit v1.7.1