From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001 From: JinPengYong <812110275@qq.com> Date: Sun, 26 Apr 2020 16:18:30 +0800 Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts. --- 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