Merge remote-tracking branch 'origin/master'

game-business/src/main/java/com/game/business/config/GameTwoConfig.java

@@ -16,7 +16,7 @@ public class GameTwoConfig implements CommandLineRunner {
     @Override
     @Async
     public void run(String... args) throws Exception {
-        webSocketConnent = new WebSocketConnent(Common.WS_GAME_TWO_URL, Common.GANME_TWO_NAME);
-        webSocketConnent.connect();
+//        webSocketConnent = new WebSocketConnent(Common.WS_GAME_TWO_URL, Common.GANME_TWO_NAME);
+//        webSocketConnent.connect();
     }
 }

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

@@ -47,6 +47,7 @@ public class AppGameItemController extends BaseController
     @ApiOperation(value = "查询游戏选项列表", notes = "获取游戏选项列表")
     public TableDataInfo<AppGameItem> list(AppGameItem appGameItem)
     {
+
         startPage();
         List<AppGameItem> list = appGameItemService.selectAppGameItemList(appGameItem);
         return getDataTable(list);