完成 赠送记录

service/verify/verify.go

@@ -86,11 +86,7 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pag
 		return nil, errors.New("获取课程列表失败")
 	}
 	if len(customerDetail) == 0 {
-<<<<<<< HEAD
-		return nil, nil
-=======
 		return nil, errors.New("今日无可核销课程")
->>>>>>> ba1b4d2ac8addee85f6a9fb991e60a159ae48209
 	}
 	customerID := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)