Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-29 aea9da84b454e95b508ab369a6913164b89449e9

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