Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupCompetitorMapper.java

@@ -88,7 +88,7 @@
     */
    int getMatchTime(@Param("worldCupId") Integer worldCupId);

    List<WorldCupListVo> getWorldCupListFromRank(@Param("uid") Integer uid);
    List<WorldCupListVo> getWorldCupListFromRank(@Param("item")MyWorldCupList myWorldCupList);


}