Merge branch 'dev' of wugg/fivechang into master

application/Admin/controller/Account.php

@@ -264,7 +264,7 @@ class Account extends Base
                 $infoacc = Db::name("account_info")->update($rela);
                 $del = Db::name('rela_video')->where(["is_del"=>0,"accountid"=>$id])->select();
                     if($del==true){
-                        $dl = Db::name('rela_video')->where(["is_del"=>0,"accountid"=>$id])->update(["updatetime"=>date("Y-m-d H:i:s"),"is_del"=>1]);
+                        $dl = Db::name('rela_video')->where(["is_del"=>0,"accountid"=>$id])->update(["addtime"=>date("Y-m-d H:i:s"),"is_del"=>1]);
                     }
               //$relo=["video_id"=>$video,"accountid"=>$video,"addtime"=>date("Y-m-d H:i:s")];
                 $k=[];