111

application/route.php

@@ -172,7 +172,6 @@ Route::group('index', [
     'lable'                 => [ 'index/label/index', [ 'method' => 'get' ] ],  //标签列表
     'getDistrict'           => [ 'index/District/getList', [ 'method' => 'get' ] ], //获取部门列表
     //数据统计
-<<<<<<< HEAD
     'RemarkFollowList'      => [ 'index/remark/followUpList', [ 'method' => 'get' ] ],//跟进列表
     'phone_list'            => [ 'index/Phone/index', [ 'method' => 'get' ] ],//隐私号码列表
     'bindPhoneList'         => [ 'index/Phone/bindPhoneList', [ 'method' => 'get' ] ],//绑定的隐私号码列表