diff --git a/extend/catcher/CatchQuery.php b/extend/catcher/CatchQuery.php
index f771b0d..3f018b8 100644
--- a/extend/catcher/CatchQuery.php
+++ b/extend/catcher/CatchQuery.php
@@ -168,7 +168,7 @@ class CatchQuery extends Query
                 }
                 $endPos = strpos($field, 'end_');
                 if ($endPos === 0) {
-                    $this->where(str_replace('end_', '', $field), '>=', strtotime($value));
+                    $this->where(str_replace('end_', '', $field), '<=', strtotime($value));
                 }
                 // 模糊搜索
                 if (Str::contains($field, 'like')) {
diff --git a/extend/catcher/library/table/Table.php b/extend/catcher/library/table/Table.php
index c63ffeb..a81f336 100644
--- a/extend/catcher/library/table/Table.php
+++ b/extend/catcher/library/table/Table.php
@@ -52,7 +52,7 @@ class Table
      *
      * @var bool
      */
-    protected $hiddenPaginate = false;
+    protected $hidePagination = false;
 
     /**
      * tree table
@@ -113,6 +113,20 @@ class Table
     protected $usedModel;
 
 
+    /**
+     * 树状展开
+     *
+     * @var bool
+     */
+    protected $defaultExpandAll;
+
+    /**
+     * 默认
+     *
+     * @var bool
+     */
+    protected $border = true;
+
     /**
      * Table constructor.
      * @param string $ref
@@ -237,7 +251,21 @@ class Table
      */
     public function withHiddenPaginate(): Table
     {
-        $this->hiddenPaginate = true;
+        $this->hidePagination = true;
+
+        return $this;
+    }
+
+    /**
+     * 展开
+     *
+     * @time 2021年04月26日
+     * @param bool $expand
+     * @return $this
+     */
+    public function expandAll($expand = true): Table
+    {
+        $this->defaultExpandAll = $expand;
 
         return $this;
     }