Merge branch 'version/v0.1' of gitlab.trgame.cn:zyztech/zyz_server

# Conflicts:
#	shared/resource/jsons/dic_api.json

game-server/app/servers/battle/handler/comBattleHandler.ts

@@ -54,7 +54,7 @@ export class ComBattleHandler {
         let teamCode = session.get('teamCode');
         const { blueprtId, pub, ceLimit } = msg;
 
-        console.log('createTeam msg: ', msg);
+        // console.log('createTeam msg: ', msg);
         // 检查藏宝图Id是否合法
         if (!blueprtIdValid(blueprtId)) return resResult(STATUS.COM_BATTLE_BLUEPRT_INVALID);
         const enoughBlueprt = await hasEnoughBlueprt(roleId, sid, blueprtId);