冲突解决

@@ -87,11 +87,3 @@ func GetUserCompanyBy(userid int64, companyId int64) (*UserCompany, error) {
 	}
 	}
 	return v, nil
 	return v, nil
 }
 }
-<<<<<<< HEAD
-
-func GetUserCompanyByUser(userid int64) ([]UserCompany, error) {
-	//datasql := ``
-	return nil, nil
-}
-=======
->>>>>>> 626a6b6d8e73bd83579be13a797ab6c1fce8d3d8