冲突修改

service/message/image.go

@@ -71,12 +71,8 @@ func (s *MessageServ) SaveImg(imginfo model.TaCmsImages) (*model.TaCmsImages, er
 	if imginfo.ForwardType == ForwardTypeUrl && imginfo.ForwardUrl == "" {
 		return nil, errors.New("跳转地址不允许为空！")
 	}
-<<<<<<< HEAD
-	if imginfo.ForwardType == ForwardTypeCourse && imginfo.CaseId == "" {
-=======
 
 	if imginfo.ForwardType == ForwardTypeCourse && imginfo.ForwardResourceId == "" {
->>>>>>> e764b3b931d583be9d2c311ab12132dd234f3ae0
 		return nil, errors.New("跳转资源不允许为空！")
 	}
 

service/verify/verify.go

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