Merge remote-tracking branch 'origin/master'

# Conflicts:
#	api/task/v1/task.go

api/reward/v1/reward.go

@@ -287,7 +287,8 @@ type GetUserRewardsCanClaimListReq struct {
 	g.Meta        `path:"/reward/canClaim" method:"get" tags:"PC/Reward" summary:"(PC)获取用户可领取的奖励列表"`
 	StoreId       int64  `json:"storeId" dc:"门店id"`
 	NetbarAccount string `json:"netbarAccount" dc:"网吧账号"`
-	TaskId        string `json:"taskId" dc:"任务id" v:"required#任务id不能为空"`
+	TaskId        string `json:"taskId" dc:"任务id，任务列表使用"`
+	UserTaskId    int64  `json:"userTaskId" dc:"用户任务记录id, 任务记录列表使用"`
 }
 
 type GetUserRewardsCanClaimListRes struct {