Merge remote-tracking branch 'origin/tuoyun' into tuoyun

# Conflicts:
#	pkg/common/db/batch_insert_chat.go

pkg/common/db/batch_insert_chat.go

@@ -38,7 +38,6 @@ func (d *DataBases) BatchInsertChat(userID string, msgList []*pbMsg.MsgDataToMQ,
 	msgListToMongoNext := make([]MsgInfo, 0)
 	seqUid := ""
 	seqUidNext := ""
-	//1,
 	log.Debug(operationID, "remain ", remain, "insertCounter ", insertCounter, "currentMaxSeq ", currentMaxSeq, userID, len(msgList))
 	for _, m := range msgList {
 		log.Debug(operationID, "msg node ", m.String(), m.MsgData.ClientMsgID)