Update beds with sql db (!40) · Merge requests · Chen Liang / Team6-Digital Insight for Health · GitLab

Snippets Groups Projects

Merged Burhan Akbar requested to merge ba into main 5 months ago

Nov 27, 2024
- Merge branch 'main' into 'ba' · 26bcbe0a
  Burhan Akbar authored 5 months ago
```
# 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
```
  26bcbe0a
- fixed merge conflicts with main · 0e8093aa
  Burhan Akbar authored 5 months ago
  
  0e8093aa
- update styling a lil bit & Add hospital feature (demo) · 6825d0c8
  Burhan Akbar authored 5 months ago
  
  6825d0c8
- update available beds jdbc template and mapping (demo) · 85bd2c9d
  Burhan Akbar authored 5 months ago
  
  85bd2c9d
- available beds demo · bdcf338c
  Burhan Akbar authored 5 months ago
  
  bdcf338c