merge

models/flashbuy/flashbuy.go

@@ -263,12 +263,8 @@ FROM
 	INNER JOIN sys_case c ON a.case_id = c.case_id
 	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
 	err := m.db.Sql(sql).Find(&customerDetail)
-<<<<<<< HEAD
 	return &customerDetail[0], err
 
-=======
-	return &customerDetail, err
->>>>>>> 63bfb0cd7305426fd53d92beaddae3b018099e62
 }
 
 // GetCustomerFlashBuy 获取用户抢购信息