remove type attribute in teamDto and DepartmentDto
 merge with origin/sprint
resolved merge conflicts