Merge branch 'master' into v5

application/wechat/service/FansService.php

@@ -57,7 +57,6 @@ class FansService
     public static function get($openid)
     {
         return Db::name('WechatFans')->where(['openid' => $openid])->find();
-        return $user;
     }
 
 }

config/app.php

@@ -21,5 +21,5 @@ return [
     // URL参数方式 0 按名称成对解析 1 按顺序解析
     'url_param_type' => 1,
     // 当前 ThinkAdmin 版本号
-    'thinkadmin_ver' => 'demo',
+    'thinkadmin_ver' => 'v5',
 ];