Merge remote-tracking branch 'origin/master'

xuhy

2024-10-14 e9f36d42efaa757c7f93b00ba3ff9fb0d0bf46c9

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java

@@ -23,9 +23,9 @@
    private Integer pageSize = 10;

    public Integer getPageCurr() {
        if(null != pageCurr){
            pageCurr = (pageCurr - 1) * pageSize;
        }
//        if(null != pageCurr){
//            pageCurr = (pageCurr - 1) * pageSize;
//        }
        return pageCurr;
    }