Merge branch 'refs/heads/yufenghao'

pom.xml

@@ -51,8 +51,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <version>5.3.1</version>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/com/example/gb/service/impl/GoldbeanConsumeServiceImpl.java

@@ -21,10 +21,7 @@ public class GoldbeanConsumeServiceImpl implements GoldbeanConsumeService {
     }
     @Override
     public Result getLiveConsumeList(Page page) {
-        System.out.println("currentPage："+ page.getCurrentPage()+ "pageSize："+page.getPageSize());
-        int currentPage = page.getCurrentPage() != null ? page.getCurrentPage() : 1;
-        int pageSize = page.getPageSize() != null ? page.getPageSize() : 10;
-        PageHelper.startPage(currentPage,pageSize);
+        PageHelper.startPage(page.getCurrentPage(),page.getPageSize());
         List<LiveOrderVO> list = goldbeanConsumeMapper.getLiveConsumeList();
         PageInfo<LiveOrderVO> pageInfo = new PageInfo<>(list);
         System.out.println("实际查询结果总数：" + pageInfo.getTotal() + "，当前页数据条数：" + pageInfo.getSize());