From 455498f1454449bfd127a560eeb01ffff823a6ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 13:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/config/PageHelperConfig.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/config/PageHelperConfig.java b/src/main/java/com/moral/config/PageHelperConfig.java
index d51c7e7..4aca388 100644
--- a/src/main/java/com/moral/config/PageHelperConfig.java
+++ b/src/main/java/com/moral/config/PageHelperConfig.java
@@ -17,6 +17,7 @@
         Properties properties = new Properties();
         properties.setProperty("offsetAsPageNum","true");
         properties.setProperty("rowBoundsWithCount","true");
+        properties.setProperty("pageSizeZero","true");
         properties.setProperty("reasonable","true");
         properties.setProperty("dialect","mysql");    //������mysql������������������
         pageHelper.setProperties(properties);

--
Gitblit v1.8.0