From 5336543c204504979168139560d88f896eb7fd45 Mon Sep 17 00:00:00 2001
From: zhujj <Administrator@G6DKBNY0IH0AICJ>
Date: Tue, 29 Jan 2019 13:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A8=E6=A0=BC=E4=B8=AD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 17fec1d6a..6113911dc 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -46,7 +46,7 @@
                     pagination: $.common.visible(options.pagination),   // 是否显示分页（*）
                     pageNumber: 1,                                      // 初始化加载第一页，默认第一页
                     pageSize: 10,                                       // 每页的记录行数（*） 
-                    pageList: [10,50,100,'1000'],                             // 可供选择的每页的行数（*）
+                    pageList: [10,50,100,1000,"ALL"],                             // 可供选择的每页的行数（*）
                     clickToSelect: true,								// 点击行选中
                     iconSize: 'outline',                                // 图标大小：undefined默认的按钮尺寸 xs超小按钮sm小按钮lg大按钮
         	        toolbar: '#toolbar',                                // 指定工作栏