resolve conflict

This commit is contained in:
Hafifie PKB
2023-12-12 12:58:35 +08:00
19 changed files with 2964 additions and 1005 deletions
+2
View File
@@ -777,6 +777,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->put('tetapan/listbarcode/update',['uses'=>'AdminPageController@ListBarcodeScannedOperasi_Update']);
$router->get('tetapan/penggunamargin',['uses'=>'AdminPageController@PenggunaMargin']);
$router->put('tetapan/penggunamargin/update',['uses'=>'AdminPageController@PenggunaMargin_Update']);
$router->get('tetapan/listcawangan',['uses'=>'AdminPageController@ListCawangan']);
$router->put('tetapan/listcawangan/update',['uses'=>'AdminPageController@ListCawangan_Update']);
$router->get('laporanllcaw/gadai',['uses'=>'AdminPageController@getLaporanGadaiAllCaw']);