From 31e2e355c4a837c0b6e04899ed3d854edd105816 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 12 May 2021 16:05:14 +0800 Subject: [PATCH] =?UTF-8?q?--=E4=BF=AE=E5=A4=8D=E5=88=86=E6=9D=A5=E5=B8=A6?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E6=8B=BC=E5=9B=A2=E7=A0=8D=E4=BB=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yixiang/modules/activity/rest/StoreBargainController.java | 2 +- .../modules/activity/rest/StoreCombinationController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 9bf1cf1d..e2aa2e1f 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -99,7 +99,7 @@ public class StoreBargainController { public ApiResult getYxStoreBargainPageList(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "limit",defaultValue = "10") int limit){ - return ApiResult.resultPage(Collections.singletonList(storeBargainService.getList(page, limit)),limit); + return ApiResult.resultPage(storeBargainService.getList(page, limit),limit); } /** diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index 24a9d208..e526db35 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -84,7 +84,7 @@ public class StoreCombinationController { @ApiOperation(value = "拼团产品列表",notes = "拼团产品列表") public ApiResult getList(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "limit",defaultValue = "10") int limit){ - return ApiResult.resultPage(storeCombinationService.getList(page, limit),limit); + return ApiResult.ok(storeCombinationService.getList(page, limit)); } /**