Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/cms.hailearning.edu.vn into fix/bao-04022026-service-management

2026-02-04 11:50:51 +07:00
parent 37123976c6 d2d5f53f1d
commit 7115cb735a
18 changed files with 5623 additions and 93 deletions
--- a/views/layouts/admin.ejs
+++ b/views/layouts/admin.ejs
@@ -85,7 +85,6 @@
              <a class="nav-link" href="/admin/camp-location">Camp Location</a>
            </li>
            <li class="nav-item">
-
            <li class="nav-item">
              <a class="nav-link" href="/admin/form">Form</a>
            </li>