冲突

application/route.php

@@ -56,11 +56,8 @@ Route::group('index', [
     'entrust_list' => [ 'index/member.index/entrust_list', [ 'method' => 'get' ] ],
     'banner' => [ 'index/banner/index', [ 'method' => 'get' ] ],
     'bannerList' => [ 'index/banner/getBannerList', [ 'method' => 'post' ] ],
-<<<<<<< Updated upstream
-=======
     'usersList'  => ['index/member/getUserList',['method'=>'get']],
     'user'=> ['index/member/index']
->>>>>>> Stashed changes
 ]);