Skip to content

feature/COMP-21_swagger#9

Merged
Rustam-Bikiteev merged 7 commits intodevfrom
feature/COMP-21_swagger
May 19, 2023
Merged

feature/COMP-21_swagger#9
Rustam-Bikiteev merged 7 commits intodevfrom
feature/COMP-21_swagger

Conversation

@anastasiachuryumova
Copy link
Copy Markdown
Collaborator

добавила связи между сущностями
добавила swagger
контроллеры не отображаются

добавила swagger но он пока не показывает контроллер
@Rustam-Bikiteev
Copy link
Copy Markdown
Collaborator

Rustam-Bikiteev commented May 18, 2023

Реквест не в мастер а в дев:)

anastasiachuryumova and others added 3 commits May 19, 2023 10:48
добавила ломбок
заменила entity на table
написала импорты без звездочек
но выдает ошибку NoClassDefFoundError: org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor
@Rustam-Bikiteev Rustam-Bikiteev changed the base branch from master to dev May 19, 2023 15:00
TimKhasanov and others added 3 commits May 19, 2023 20:21
# Conflicts:
#	pom.xml
#	src/main/java/com/aston/componentsystem/model/Aircraft.java
#	src/main/java/com/aston/componentsystem/model/Balance.java
#	src/main/java/com/aston/componentsystem/model/Component.java
#	src/main/java/com/aston/componentsystem/model/Flight.java
#	src/main/java/com/aston/componentsystem/model/Warehouse.java
#	src/main/java/com/aston/componentsystem/model/WorkCard.java
#	src/main/resources/application.properties
…ature/COMP-21_swagger

# Conflicts:
#	src/main/java/com/aston/componentsystem/controller/HelloController.java
@Rustam-Bikiteev Rustam-Bikiteev merged commit 8bdf819 into dev May 19, 2023
@Rustam-Bikiteev Rustam-Bikiteev deleted the feature/COMP-21_swagger branch May 23, 2023 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants