Merge remote-tracking branch 'origin/master'

api/vote/v1/vote.go

@@ -14,12 +14,12 @@ type VoteReq struct {
 	DeadlineTime *gtime.Time `json:"deadlineTime" dc:"活动截止时间"`
 	Status       int         `json:"status" dc:"投票活动状态"`
 	Page         int         `p:"page" v:"required|integer|min:1#数据页不能为空|数据页只能是整数|数据页不能小于1" dc:"页数"`
-	PageSize     int         `p:"page_size" v:"integer|min:1#数据大小只能为整数|数据大小不能小于1" d:"20" dc:"每页数据量"`
+	PageSize     int         `p:"pageSize" v:"integer|min:1#数据大小只能为整数|数据大小不能小于1" d:"20" dc:"每页数据量"`
 }
 
 type VoteRes struct {
 	Page     int    `json:"page" dc:"页数"`
-	PageSize int    `json:"page_size" dc:"每页数据量"`
+	PageSize int    `json:"pageSize" dc:"每页数据量"`
 	Total    int    `json:"total" dc:"总记录数"`
 	Rows     []Vote `json:"rows" dc:"投票活动列表"`
 }