Skip to content
Snippets Groups Projects

Update beds with sql db

Merged Update beds with sql db
ba into main
Merged Burhan Akbar requested to merge ba into main
Viewing commit 26bcbe0a
Prev
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
3
  • 26bcbe0a
    Burhan Akbar
    Merge branch 'main' into 'ba' · 26bcbe0a
    Burhan Akbar authored 
    # 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