Merge branch 'test'

application/api/controller/Version.php

@@ -38,6 +38,9 @@ class Version extends Basic
         if(isset($type)){
             $this->response("101","请求的设备类型不能为空");
         }
+        if($type == "android"){
+            $type = 0;
+        }
         $versionResult = $this->appVersion->getVersion($type);
         return $this->response("200", "request success", $versionResult);
     }

application/model/ADistrict.php

@@ -107,7 +107,7 @@ class ADistrict extends BaseModel
             $agents = Db::table('a_agents')->field('name,phone')
                 ->where([
                     'status' => 0,
-                    'level'  => ['in',['30,40']],
+                    'level'  => ['in',[30,40]],
                     'district_id' => $id
                 ])->find();