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

# Conflicts:
#	app/Http/Controllers/PenilaianController.php
#	resources/views/penilai/components/lpj-sederhana-standard.blade.php
This commit is contained in:
Daeng Deni Mardaeni
2024-12-30 15:16:14 +07:00
11 changed files with 1653 additions and 1311 deletions

View File

@@ -520,17 +520,6 @@
"admin"
]
},
{
"title": "SLA",
"path": "basicdata.sla",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"admin"
]
},
{
"title": "Bentuk",
"path": "basicdata.bentuk-tanah",