Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/site/easystartup/web/project/controller/ProjectController.java
This commit is contained in:
Viktoria committed 2022-09-01 17:01:38 +02:00
commit c7cca9a77e
29 files changed
+640 -71

No files matched your search

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
@RestController
@RequiredArgsConstructor
@RequestMapping("/project")
@RequestMapping("/api/project")
@Tag(name = "Проекты", description = "контроллер для работы с проектами")
public class ProjectController {
private final ProjectService projectService;