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

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

shared/db/HangUpRecord.ts

@@ -39,13 +39,13 @@ export default class HangUpRecord extends BaseModel {
   received: boolean; // 是否已经领取，true-领取，false-未领取
 
   public static async initRecord(roleId: string, roleName: string, lean = true) {
-    console.log('****** initRecord before')
+    // console.log('****** initRecord before')
     const curTime = new Date();
     const recDoc = new HangUpRecordModel();
     const update = Object.assign(recDoc.toJSON(), {roleId, roleName, startTime: curTime, startLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1});
     const rec: HangUpRecordType = await HangUpRecordModel.findOneAndUpdate({roleId, startLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1}, { $setOnInsert: update }, {upsert: true, new: true}).lean(lean);
     
-    console.log('****** initRecord after')
+    // console.log('****** initRecord after')
     return rec;
   }