Merge branch 'master' into dev

app-pt/controllers/ApplyController.php

@@ -36,10 +36,18 @@ class ApplyController extends BaseController
     {
         $get = Yii::$app->request->get();
         $status = $get['status'] ?? 0;
+        $name = $get['name'] ?? '';
         $where = [];
         if (!empty($status)) {
             $where['status'] = $status;
         }
+        if (!empty($name)) {
+            if (is_numeric($name)) {
+                $where['mobile'] = ['like', $name];
+            } else {
+                $where['name'] = ['like', $name];
+            }
+        }
         $list = ApplyService::getApplyList($where);
         util::success($list);
     }

app-pt/controllers/ShopController.php

@@ -103,7 +103,9 @@ class ShopController extends BaseController
         $where = [];
         $name = Yii::$app->request->get('name', '');
         if (!empty($name)) {
-            if (stringUtil::isLetter($name)) {
+            if (is_numeric($name)) {
+                $where['mobile'] = ['like', $name];
+            } elseif (stringUtil::isLetter($name)) {
                 $where['py'] = ['like', $name];
             } else {
                 $where['merchantName'] = ['like', $name];