Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-29 1e7c54e5e8d309edb2caa4681888d3c6a3ea7626

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

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

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