Merge branch 'yun-group-buy' of k.zhang/duoduo into yun-master

apis/shanghu/client.active.draw.log.go

@@ -55,6 +55,7 @@ func DrawLog(c *gin.Context) {
 		drawLog.DrawProductName = drawProductInfo.DrawProductName
 		drawLog.IsPrize = v.IsPrize
 		drawLog.Id = v.ID
+		drawLog.ActiveId = v.ActiveConfigID
 		drawLog.Url = drawProductInfo.DrawUrl
 		drawLog.DrawTime = v.CreatedAt.Format(time.DateTime)
 		outData = append(outData, drawLog)

apis/shanghu/models/client.active.draw.log.go

@@ -11,7 +11,8 @@ type ClientDrawLogReply struct {
 	IsPrize         int    `json:"is_prize"`          //1-未中奖 2-未兑奖 3-已兑奖
 	Url             string `json:"url"`               //
 	Id              int64  `json:"id"`                //id
-	DrawTime        string `json:"draw_time"`
+	DrawTime        string `json:"draw_time"`         //
+	ActiveId        int64  `json:"active_id"`         //
 }
 
 type DrawLogVerificationCodeRequest struct {