Merge remote-tracking branch 'origin/dev' into test

5 years ago · ffdfd866e0
parent e9ce24d6f9 b2bc93abfe
commit ffdfd866e0
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
@ -114,7 +114,7 @@ public class Pager {
    }

    public int getCurrentPage() {
-        return currentPage;
+        return currentPage < 1 ? 1 : currentPage;
    }

    public void setCurrentPage(int currentPage) {