1、bug的修复

2、内核更新
2016-07-10 23:48:24 +08:00
parent f3fff63632
commit 1a0a29413a
50 changed files with 760 additions and 958 deletions
--- a/application/admin/controller/Model.php
+++ b/application/admin/controller/Model.php
@@ -139,7 +139,7 @@ class Model extends Admin{
 		if($res['status']){
 			return $this->success($res['info'], url('index'));
 		}else{
-			return $this->error($res['info'], '');
+			return $this->error($res['info']);
 		}
 	}