Merge remote-tracking branch 'origin/main' into...
Merge remote-tracking branch 'origin/main' into 34-as-a-superadmin-i-want-to-be-able-to-see-my-username-and-permissions-on-the-page-so-that-i-can # Conflicts: # src/main/resources/application-dev.yml # src/main/resources/static/js/beds.js
No related branches found
No related tags found
Showing
- src/main/java/com/cardiff/client_project/controller/admin/CommonAdminHospitalController.java 14 additions, 8 deletions...oject/controller/admin/CommonAdminHospitalController.java
- src/main/java/com/cardiff/client_project/mapper/CommonAdminHospitalMapper.java 30 additions, 15 deletions...diff/client_project/mapper/CommonAdminHospitalMapper.java
- src/main/java/com/cardiff/client_project/pojo/entity/NursingHome.java 1 addition, 0 deletions...a/com/cardiff/client_project/pojo/entity/NursingHome.java
- src/main/java/com/cardiff/client_project/service/CommonAdminHospitalService.java 9 additions, 0 deletions...ff/client_project/service/CommonAdminHospitalService.java
- src/main/java/com/cardiff/client_project/service/imp/CommonAdminHospitalServiceImp.java 31 additions, 21 deletions...nt_project/service/imp/CommonAdminHospitalServiceImp.java
- src/main/resources/static/html/admin.html 94 additions, 82 deletionssrc/main/resources/static/html/admin.html
- src/main/resources/static/js/beds.js 69 additions, 7 deletionssrc/main/resources/static/js/beds.js
Loading
Please register or sign in to comment