resolved conficts

src/main/java/net/gepafin/tendermanagement/service/impl/CompanyServiceImpl.java

@@ -114,4 +114,7 @@ public class CompanyServiceImpl implements CompanyService {
 		UserEntity userEntity =validator.validateUser(request);
 		delegationDao.deleteCompanyDelegation(userEntity, companyId);
 	}
+	public  UserWithCompanyEntity getUserWithCompanyEntity(Long userId,Long companyId){
+		return companyDao.getUserWithCompany(userId,companyId);
+	}
 }