Merge branch 'dev' of wugg/fivechang into master

.gitignore

@@ -1,3 +1,7 @@
 .idea
 composer.lock
 *.log
+application/config.php
+application/database.php
+runtime
+

application/Admin/controller/Account.php

@@ -50,7 +50,7 @@ class Account extends Base
         $list = Db::name("account_list")->where($where)->page($page,$size)->order("addtime desc")->select();
         $i=[];
         foreach ($list as $vus ){
-            $vi = Db::name('rela_video')->join('fc_video a','a.id=rela_video.video_id','left')->field('a.video_sn,a.video_name,a.video_url,a.video_img')->where(['accountid'=>$vus['id'],'is_del'=>0,])->select();
+            $vi = Db::name('rela_video')->join('fc_video a','a.id=fc_rela_video.video_id','left')->field('a.video_sn,a.video_name,a.video_url,a.video_img')->where(['accountid'=>$vus['id'],'a.is_del'=>0,])->select();
             if(empty($vi)){
                 $vi=[];
             }