admin update

admin/control/merchant.php

@@ -29,11 +29,7 @@ class merchantControl extends SystemControl
         $model_merchant = Model('merchant');
 
         if (trim($_GET['merchant_name']) != '') {
-            $condition = [
-                'name' => $_GET['merchant_name'],
-                'company_name' => $_GET['merchant_name'],
-                '_op' => 'or'
-            ];
+            $condition['company_name'] = ['like', '%'.$_GET['merchant_name'].'%'];
         }
 
         $merchant_list = $model_merchant->getMerchantList($condition, 100, 'available_predeposit desc,merchant_state asc,mchid desc');