Merge remote-tracking branch 'origin/master'

service/task/game_task.go

@@ -366,7 +366,7 @@ func (apiService *GameTask) GetUsedGameTaskInfoList(api task.GameTask, info requ
 	}
 
 	if api.TaskId != 0 {
-		db = db.Where("task_id = ?", api.TaskId)
+		db = db.Where("game_task.task_id = ?", api.TaskId)
 	}
 
 	//获取启用状态的任务