Merge branch 'test'

application/api_broker/controller/User.php

@@ -124,14 +124,14 @@ class User extends Basic
         if (empty($userList)) {
             return $this->response("200", "此条件没有找到数据");
         }
-  /*      $clientService = new ClientService();
+        $clientService = new ClientService();
         $list          = [];
         foreach ($userList as $k => $v) {
             $is_show = $clientService->dialTotal($v["user_id"]);
             if ($is_show) {
                 array_push($list, $v);
             }
-        }*/
+        }
         $vip_services        = new VipService();
         $data['examine_vip'] = $vip_services->vip($this->agentId);
         $data['user_date']   = $userList;

application/api_broker/service/UploadFileService.php

@@ -20,7 +20,7 @@ class UploadFileService
      * @param array $ext
      * @return array
      */
-    public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg','png','jpeg','xlsx','doc','pdf'])
+    public function upload($_upload_file, $type, $size = 1000000, $ext = [ 'jpg','png','jpeg','xlsx','doc','docx','pdf'])
     {
         /**
          *