Skip to content
Commit da72d419 authored by Josef Augustín's avatar Josef Augustín
Browse files

Merge branch 'main' into 'Implement-Backoffice-CRUD-Backend'

# Conflicts:
#   backoffice/backoffice-api/pom.xml
#   backoffice/backoffice-api/src/main/java/dto/doctor/UpdateDoctorRequestDto.java
#   backoffice/backoffice-impl/pom.xml
#   backoffice/backoffice-impl/src/main/java/cz/muni/fi/pa165/medystem/backoffice/mapper/AppointmentMapper.java
#   backoffice/backoffice-impl/src/main/java/cz/muni/fi/pa165/medystem/backoffice/mapper/DoctorMapper.java
#   backoffice/backoffice-impl/src/main/java/cz/muni/fi/pa165/medystem/backoffice/mapper/MedicalRecordMapper.java
#   backoffice/backoffice-impl/src/main/java/cz/muni/fi/pa165/medystem/backoffice/mapper/PatientMapper.java
#   backoffice/backoffice-impl/src/main/java/cz/muni/fi/pa165/medystem/backoffice/service/validation/AppointmentValidation.java
#   backoffice/backoffice-impl/src/main/resources/application.properties
parents 090034a4 c7f645f0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment