fix conflict

@@ -142,11 +142,6 @@ func (controller *CooperationApplicationController) SearchCooperationApplication
 	if err != nil {
 	if err != nil {
 		log.Logger.Error("json 解析失败" + err.Error())
 		log.Logger.Error("json 解析失败" + err.Error())
 	}
 	}
-	header := controller.GetRequestHeader(controller.Ctx)
-	searchCooperationApplicationQuery.CompanyId = header.CompanyId
-	searchCooperationApplicationQuery.OrgId = header.OrgId
-	searchCooperationApplicationQuery.UserId = header.UserId
-	searchCooperationApplicationQuery.UserBaseId = header.UserBaseId
 	data, err := cooperationApplicationService.SearchCooperationApplication(searchCooperationApplicationQuery)
 	data, err := cooperationApplicationService.SearchCooperationApplication(searchCooperationApplicationQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }