Merge branch 'master' of https://github.com/top-think/framework

library/think/Db.php

@@ -14,6 +14,7 @@ namespace think;
 use think\App;
 use think\Collection;
 use think\db\Query;
+use think\paginator\Collection as PaginatorCollection;
 
 /**
  * Class Db

library/think/db/Connection.php

@@ -23,6 +23,13 @@ use think\Exception;
 use think\exception\PDOException;
 use think\Log;
 
+/**
+ * Class Connection
+ * @package think
+ * @method Query table(string $table) 指定数据表（含前缀）
+ * @method Query name(string $name) 指定数据表（不含前缀）
+ *
+ */
 abstract class Connection
 {