From 939f8640d36753f3ba8df9abcb390938f7704af3 Mon Sep 17 00:00:00 2001
From: chenghongxing <1126263215@qq.com>
Date: Mon, 5 Apr 2021 09:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E5=88=86=E9=A1=B5=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=B8=8D=E6=94=AF=E6=8C=81=20boolean=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=20fix:=20the=20pa?=
 =?UTF-8?q?gination=20props=20of=20AdvancedTable.vue=20does=20not=20suppor?=
 =?UTF-8?q?t=20boolean=20value;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          | 2 +-
 src/components/table/advance/AdvanceTable.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 7754615..0c6e7c8 100644
--- a/.env
+++ b/.env
@@ -7,4 +7,4 @@ VUE_APP_USER_KEY=admin.user
 VUE_APP_SETTING_KEY=admin.setting
 VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_API_BASE_URL=http://api.iczer.com
\ No newline at end of file
+VUE_APP_API_BASE_URL=http://api.iczer.com
diff --git a/src/components/table/advance/AdvanceTable.vue b/src/components/table/advance/AdvanceTable.vue
index d771a79..73a3c2e 100644
--- a/src/components/table/advance/AdvanceTable.vue
+++ b/src/components/table/advance/AdvanceTable.vue
@@ -76,7 +76,7 @@
       indentSize: Number,
       loading: Boolean,
       locale: Object,
-      pagination: Object,
+      pagination: [Object, Boolean],
       rowClassName: Function,
       rowKey: [String, Function],
       rowSelection: Object,