Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-18 db13a3d02bdf713087835f0c3a5522758a5948ea

 src/main/java/com/ruoyi/framework/web/page/PageDomain.java

@@ -21,6 +21,9 @@
    /** 排序的方向desc或者asc */

    private String isAsc = "asc";



    /** 分页参数合理化 */

    private Boolean reasonable = true;



    public String getOrderBy()

    {

        if (StringUtils.isEmpty(orderByColumn))

@@ -81,4 +84,18 @@
            this.isAsc = isAsc;

        }

    }



    public Boolean getReasonable()

    {

        if (StringUtils.isNull(reasonable))

        {

            return Boolean.TRUE;

        }

        return reasonable;

    }



    public void setReasonable(Boolean reasonable)

    {

        this.reasonable = reasonable;

    }

}