Browse Source

Default Changelist

yingzi 2 years ago
parent
commit
623b581053
1 changed files with 0 additions and 5 deletions
  1. 0 5
      app/api/route/user.php

+ 0 - 5
app/api/route/user.php

@@ -25,13 +25,8 @@ Route::group('user', function () {
     Route::rule('subTypeAudit', 'User/subTypeAudit');
     Route::rule('subTypeAudit', 'User/subTypeAudit');
     //获取用户子级列表
     //获取用户子级列表
     Route::rule('getChildList', 'User/getChildList');
     Route::rule('getChildList', 'User/getChildList');
-<<<<<<< HEAD
     //获取用户总邀请人数排行榜
     //获取用户总邀请人数排行榜
     Route::rule('getInviterRanking','User/getInviterRanking');
     Route::rule('getInviterRanking','User/getInviterRanking');
-=======
-    //获取邀请人数排行榜
-    Route::rule('getInviterRanking','User/getInviterRanking');
->>>>>>> b1c250f8cc2d64dfdf9f96dd213493c005116a46
     //提交模板订单
     //提交模板订单
     Route::rule('subShowTemplateOrder', 'User/subShowTemplateOrder');
     Route::rule('subShowTemplateOrder', 'User/subShowTemplateOrder');
     //模板支付订单状态查询
     //模板支付订单状态查询