edit

service/agent/database/member.php

@@ -122,9 +122,9 @@ return array
             'desc'      => '姓名',
             'match'     => 'is_string',
             'update'    => 'text',
-<<<<<<< HEAD
+
             'search'    => ($parent_mid) ? 'hidden' : 'fulltext',
-=======
+
             //'search'    => 'fulltext',
             'search'    => array
             (
@@ -134,7 +134,6 @@ return array
                 'search' => 'id',
             ),
             'list_name' => '代理商信息',
->>>>>>> 151a6083c511eb33ea442b3fcfd42d8c35f7f464
             'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)',
         ),