Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <角色列表原始区服, 游戏选择列表修改> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <游戏列表新增字段返回> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameChoiceVO.java

@@ -29,6 +29,12 @@ public class GameChoiceVO {
     @ApiModelProperty(notes = "游戏应用类型id")
     private Long category;
 
+    /**
+     * 父游戏id
+     */
+    @ApiModelProperty(notes = "父游戏id")
+    private Long parentId;
+
     /**
      * 超父游戏id
      */

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServiceImpl.java

@@ -234,7 +234,7 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements IG
         }
         return super.list(new LambdaQueryWrapper<Game>()
                 .in(!SecurityUtil.isAdmin(), Game::getId, tuple2.getT2())
-                .select(Game::getId, Game::getName, Game::getCategory, Game::getSuperGameId))
+                .select(Game::getId, Game::getName, Game::getCategory, Game::getParentId, Game::getSuperGameId))
                 .stream()
                 .map(game -> BeanUtil.copy(game, GameChoiceVO.class))
                 .collect(Collectors.toList());