Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts: # database/migrations/2024_11_08_081149_create_permohonan_histories_table.php
2024-11-13 17:18:28 +07:00
parent 287798c266 8e9e5e4843
commit 1614387654
34 changed files with 3534 additions and 1846 deletions
--- a/module.json
+++ b/module.json
@@ -559,6 +559,14 @@
            "attributes": [],
            "permission": "",
            "roles": ["administrator","surveyor"]
+        },
+        {
+            "title": "Perkerasan jalan",
+            "path": "basicdata.perkerasan-jalan",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["administrator","surveyor"]
        }