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
Please register or sign in to comment