Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

 <?php
 <?php
 
 
-namespace App\Http\Controllers\Aside;
+namespace App\Http\Controllers\Aside\Collect;
 
 
+use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\CollectLogic;
 use App\Http\Logic\Aside\CollectLogic;
 
 
 
 

@@ -341,7 +341,7 @@ Route::group([], function () {
     Route::any('get_template_list', [Aside\Template\ATemplateController::class, 'getTemplateList'])->name('admin.get_template_list');
     Route::any('get_template_list', [Aside\Template\ATemplateController::class, 'getTemplateList'])->name('admin.get_template_list');
     Route::any('get_template_detail', [Aside\Template\ATemplateController::class, 'getTemplateDetail'])->name('admin.get_template_detail');
     Route::any('get_template_detail', [Aside\Template\ATemplateController::class, 'getTemplateDetail'])->name('admin.get_template_detail');
 
 
-    Route::any('/collect', [Aside\CollectController::class, 'index'])->name('admin.collect');
+    Route::any('/collect', [Aside\Collect\CollectController::class, 'index'])->name('admin.collect');
 });
 });