胡轶钦 6 years ago
parent
commit
c755d3c4f6
1 changed files with 4 additions and 0 deletions
  1. 4
    0
      models/flashbuy/flashbuy.go

+ 4
- 0
models/flashbuy/flashbuy.go View File

263
 	INNER JOIN sys_case c ON a.case_id = c.case_id
263
 	INNER JOIN sys_case c ON a.case_id = c.case_id
264
 	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
264
 	WHERE a.customer_flash_buy_id = '` + customerFlashBuyId + `'`
265
 	err := m.db.Sql(sql).Find(&customerDetail)
265
 	err := m.db.Sql(sql).Find(&customerDetail)
266
+<<<<<<< HEAD
266
 	return &customerDetail[0], err
267
 	return &customerDetail[0], err
267
 
268
 
269
+=======
270
+	return &customerDetail, err
271
+>>>>>>> 63bfb0cd7305426fd53d92beaddae3b018099e62
268
 }
272
 }
269
 
273
 
270
 // GetCustomerFlashBuy 获取用户抢购信息
274
 // GetCustomerFlashBuy 获取用户抢购信息