Explorar o código

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	app/Enums/Common/ErrorMessage.php
#	app/Http/Controllers/Backend/Server/System/MenuController.php
#	app/Http/Services/Backend/Server/System/DictTypeService.php
#	app/Http/Services/Backend/Server/System/MenuService.php
#	app/Models/System/Menu.php
#	database/migrations/2024_08_14_093112_create_permission_tables.php
#	database/migrations/2024_08_29_032939_create_system_menus_table.php
醉梦人间三千年 hai 7 meses
pai
achega
ae194ce607
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      bootstrap/providers.php

+ 1 - 1
bootstrap/providers.php

@@ -1,5 +1,5 @@
 <?php
 
 return [
-    App\Providers\AppServiceProvider::class,
+    App\Providers\AppServiceProvider::class
 ];