Merge branch 'main' into 'ba'

# Conflicts:
#   src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java
#   src/main/java/com/cardiff/client_project/mapper/HospitalMapper.java
#   src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java
#   src/main/resources/static/css/beds.css
#   src/main/resources/static/html/beds.html