From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 31 七月 2025 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
index 8c44571..76928b7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtLotteryEventController.java
@@ -16,7 +16,6 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import java.util.Collections;
import java.util.List;
/**
@@ -43,12 +42,9 @@
@RequestMapping(value = "/pageMgtLotteryEvent", method = RequestMethod.POST)
@ApiOperation(value = "分页获取抽奖列表【2.0】")
public R<Page<MgtLotteryEventPageVo>> pageMgtLotteryEvent(@RequestBody MgtLotteryEventPageDto dto) {
- Page<MgtLotteryEventPageVo> page = new Page<>();
- page.setSize(dto.getPageSize());
- page.setCurrent(dto.getPageNum());
- page.setOptimizeCountSql(false);
- List<MgtLotteryEventPageVo> mgtGoodsPageVoList = lotteryEventService.pageMgtLotteryEvent(page,dto);
- return R.ok(page.setRecords(mgtGoodsPageVoList));
+
+
+ return R.ok(lotteryEventService.pageMgtLotteryEvent(dto));
}
@RequestMapping(value = "/getLotteryEventDetailById/{id}", method = RequestMethod.POST)
--
Gitblit v1.7.1