Skip to content

T
tl_estate
Commit b58e3f06 authored by clone's avatar clone
Browse files
Options

冲突

parent a1a5a562
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
application/route.php
View file @ b58e3f06
...@@ -56,11 +56,8 @@ Route::group('index', [ ...@@ -56,11 +56,8 @@ Route::group('index', [
'entrust_list' => [ 'index/member.index/entrust_list', [ 'method' => 'get' ] ], 'entrust_list' => [ 'index/member.index/entrust_list', [ 'method' => 'get' ] ],
'banner' => [ 'index/banner/index', [ 'method' => 'get' ] ], 'banner' => [ 'index/banner/index', [ 'method' => 'get' ] ],
'bannerList' => [ 'index/banner/getBannerList', [ 'method' => 'post' ] ], 'bannerList' => [ 'index/banner/getBannerList', [ 'method' => 'post' ] ],
<<<<<<< Updated upstream
=======
'usersList' => ['index/member/getUserList',['method'=>'get']], 'usersList' => ['index/member/getUserList',['method'=>'get']],
'user'=> ['index/member/index'] 'user'=> ['index/member/index']
>>>>>>> Stashed changes
]); ]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment