From 323d1263c6674fe5815e1b325b43ebc1af18170a Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Thu, 26 Nov 2020 20:19:52 +0800
Subject: [PATCH] 11-26-8

---
 mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java    | 4 ++--
 mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
index a600e368..aee1a891 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
@@ -381,9 +381,9 @@ public class CompeteDto {
         @ApiModelProperty("项目id")
         private Long projectId;
         @ApiModelProperty("当前页")
-        private int page=1;
+        private int pageNum =1;
         @ApiModelProperty("每页数量")
-        private  int size=10;
+        private  int pageSize =10;
     }
 
     @Data
diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
index 3995ea61..0a2b9c39 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -15,7 +15,6 @@ import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ScoreVo;
-import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
 import com.ccsens.mt.util.Constant;
@@ -47,7 +46,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author 逗
@@ -1481,7 +1479,7 @@ public class CompeteService implements ICompeteService {
         long projectId = params.getProjectId();
         long competeTimeId = params.getCompeteTimeId();
         Byte type = 0;
-        PageHelper.startPage(params.getPage(),params.getSize());
+        PageHelper.startPage(params.getPageNum(),params.getPageSize());
         List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
         PageInfo pageInfo = new PageInfo<>(speedPassList);
         if (CollectionUtil.isNotEmpty(speedPassList)) {
@@ -1594,7 +1592,7 @@ public class CompeteService implements ICompeteService {
         long projectId = params.getProjectId();
         long competeTimeId = params.getCompeteTimeId();
         Byte type = 0;
-        PageHelper.startPage(params.getPage(),params.getSize());
+        PageHelper.startPage(params.getPageNum(),params.getPageSize());
         List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
         PageInfo pageInfo = new PageInfo<>(speedPassList);
         if (CollectionUtil.isNotEmpty(speedPassList)) {