改进数据表的前缀设置

base.php

@@ -90,7 +90,7 @@ function G($start,$end='',$dec=6) {
  * @return Model
  */
 function M($name='', $tablePrefix='',$connection='') {
-    return think\Loader::table($name,['table_prefix'=>$tablePrefix,'connection'=>$connection]);
+    return think\Loader::table($name,['prefix'=>$tablePrefix,'connection'=>$connection]);
 }
 
 /**

library/think/model.php

@@ -69,6 +69,8 @@ class Model {
 
         if(isset($config['prefix'])) {
             $this->tablePrefix  =   $config['prefix'];
+        }else{
+            $this->tablePrefix  =   Config::get('database.prefix');
         }
         if(isset($config['connection'])) {
             $this->connection   =   $config['connection'];