Merge branch 'ba' into...
Merge branch 'ba' into '27-as-a-user-i-would-like-to-be-able-to-add-nursing-homes-information-so-that-the-system-can-record' # Conflicts: # src/main/java/com/cardiff/client_project/controller/nursinghome/NursingHomeController.java # src/main/java/com/cardiff/client_project/service/NursingHomeService.java # src/main/java/com/cardiff/client_project/service/imp/NursingHomeServiceImp.java
No related branches found
No related tags found
Showing
- src/main/java/com/cardiff/client_project/controller/nursinghome/NursingHomeController.java 26 additions, 3 deletions...project/controller/nursinghome/NursingHomeController.java
- src/main/java/com/cardiff/client_project/mapper/NursingHomeMapper.java 57 additions, 29 deletions.../com/cardiff/client_project/mapper/NursingHomeMapper.java
- src/main/java/com/cardiff/client_project/pojo/dto/HospitalDTO.java 1 addition, 0 deletions...java/com/cardiff/client_project/pojo/dto/HospitalDTO.java
- src/main/java/com/cardiff/client_project/pojo/vo/HospitalVO.java 2 additions, 0 deletions...n/java/com/cardiff/client_project/pojo/vo/HospitalVO.java
- src/main/java/com/cardiff/client_project/service/NursingHomeService.java 2 additions, 0 deletions...om/cardiff/client_project/service/NursingHomeService.java
- src/main/java/com/cardiff/client_project/service/imp/NursingHomeServiceImp.java 82 additions, 13 deletions...iff/client_project/service/imp/NursingHomeServiceImp.java
- src/main/resources/static/css/beds.css 17 additions, 0 deletionssrc/main/resources/static/css/beds.css
- src/main/resources/static/js/beds.js 53 additions, 21 deletionssrc/main/resources/static/js/beds.js
Loading
Please register or sign in to comment