From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:07:17 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
index 387ea83..90fd209 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java
@@ -118,13 +118,6 @@
Long userId = SecurityUtils.getUserId();
mgtShopOrderPageDto.setUserId(userId);
Page<MgtActivityOrderPageVo> page = new Page<>();
-// if(mgtShopOrderPageDto.getPageSize() > 5000){
-// page.setSize(5000);
-// page.setCurrent(1);
-// }else{
-// page.setSize(mgtShopOrderPageDto.getPageSize());
-// page.setCurrent(mgtShopOrderPageDto.getPageNum());
-// }
page.setSize(Integer.MAX_VALUE);
page.setCurrent(1);
List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto);
--
Gitblit v1.7.1