From a730f8152231004e5600b7c48c18c26405d17314 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 31 May 2016 22:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Db.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/think/Db.php b/library/think/Db.php
index bac2a063..06362951 100644
--- a/library/think/Db.php
+++ b/library/think/Db.php
@@ -18,14 +18,14 @@ use think\db\Query;
  * @package think
  * @method Query table(string $table) static 指定数据表（含前缀）
  * @method Query name(string $name) static 指定数据表（不含前缀）
- * @method Query name(string $name) static 指定数据表（不含前缀）
- * @method Query where($field, $op = null, $condition = null) static 查询条件
- * @method Query join($join, $condition = null, $type = 'INNER') static JOIN查询
- * @method Query union($union, $all = false) static UNION查询
- * @method Query limit($offset, $length = null) static 查询LIMIT
- * @method Query order($field, $order = null) static 查询ORDER
- * @method mixed query($sql, $bind = [], $fetch = false, $master = false, $class = false) static SQL查询
- * @method integer execute($sql, $bind = [], $fetch = false, $getLastInsID = false, $sequence = null) static SQL执行
+ * @method Query where(array|string $field, string $op = null, mixed $condition = null) static 查询条件
+ * @method Query join(array|string $join, mixed $condition = null, string $type = 'INNER') static JOIN查询
+ * @method Query union(string|array $union, boolean $all = false) static UNION查询
+ * @method Query limit(string|integer $offset, integer $length = null) static 查询LIMIT
+ * @method Query order(string|array $field, string $order = null) static 查询ORDER
+ * @method mixed query(string $sql, array $bind = [], boolean $fetch = false, boolean $master = false, mixed $class = false) static SQL查询
+ * @method integer execute(string $sql, array $bind = [], boolean $fetch = false, boolean $getLastInsID = false, string $sequence = null) static SQL执行
+ * @method PaginatorCollection paginate(integer $listRows = 15, boolean $simple = false, array $config = []) static 分页查询
  */
 class Db
 {