Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-02 00779ea0f8374e5bbdffc8faa20d65e3c72616c2

 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;
    }