gx

@@ -262,20 +262,19 @@ Route::middleware(['bloginauth','accesstoken'])->group(function () {
         Route::any('/get_google_rank', [\App\Http\Controllers\Bside\RankDataController::class, 'get_google_rank'])->name('rank_data_get_google_rank');
         Route::any('/get_google_rank', [\App\Http\Controllers\Bside\RankDataController::class, 'get_google_rank'])->name('rank_data_get_google_rank');
     });
     });
 
 
-<<<<<<< HEAD
     //首页统计数据
     //首页统计数据
     Route::prefix('home')->group(function () {
     Route::prefix('home')->group(function () {
         Route::any('count', [\App\Http\Controllers\Bside\HomeCount\CountController::class, 'count'])->name('home_count');
         Route::any('count', [\App\Http\Controllers\Bside\HomeCount\CountController::class, 'count'])->name('home_count');
         Route::any('yesterday', [\App\Http\Controllers\Bside\HomeCount\CountController::class, 'yesterday'])->name('home_yesterday');
         Route::any('yesterday', [\App\Http\Controllers\Bside\HomeCount\CountController::class, 'yesterday'])->name('home_yesterday');
      });
      });
-=======
+
     //访问数据
     //访问数据
     Route::prefix('visit')->group(function () {
     Route::prefix('visit')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\VisitController::class, 'index'])->name('visit_list');
         Route::any('/', [\App\Http\Controllers\Bside\VisitController::class, 'index'])->name('visit_list');
         Route::any('/item', [\App\Http\Controllers\Bside\VisitController::class, 'item'])->name('visit_item');
         Route::any('/item', [\App\Http\Controllers\Bside\VisitController::class, 'item'])->name('visit_item');
     });
     });
 
 
->>>>>>> develop
+
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {