Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 9d23c9e2cfee3e02cb727773be0a61cb7cc64932

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