Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/controller/AppGameLotteryController.java

@@ -24,6 +24,7 @@ import com.game.common.core.domain.HttpRetPageArr;
 import com.game.common.core.domain.R;
 import com.game.common.core.page.TableDataInfo;
 import com.game.common.enums.BusinessType;
+import com.game.common.utils.DateUtils;
 import com.game.common.utils.SecurityUtils;
 import com.game.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -65,6 +66,10 @@ public class AppGameLotteryController extends BaseController{
     {
         startPage();
 
+        if(StringUtils.isBlank(strDate)){
+            strDate = DateUtils.getDate();
+        }
+
         LambdaQueryWrapper<AppGameLottery> queryLotteryWrapper = Wrappers.lambdaQuery();;
         queryLotteryWrapper.eq(AppGameLottery::getGameId, gameId);
         if(StringUtils.isNotBlank(gameDate)) {

game-business/src/main/java/com/game/business/service/impl/AppGameItemMultipleServiceImpl.java

@@ -38,7 +38,7 @@ public class AppGameItemMultipleServiceImpl extends ServiceImpl<AppGameItemMulti
         LambdaQueryWrapper<AppGameItemMultiple> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AppGameItemMultiple::getGameId, gameId);
         queryWrapper.orderByDesc(AppGameItemMultiple::getGameDate);
-        queryWrapper.last(" limit 1100");
+        queryWrapper.last(" limit 2100");
         return appGameItemMultipleMapper.selectList(queryWrapper);
     }
 }