Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

3 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

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

@@ -22,7 +22,7 @@
    private String isAsc = "asc";



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

    private Boolean reasonable = false;

    private Boolean reasonable = true;



    public String getOrderBy()

    {

@@ -87,6 +87,10 @@


    public Boolean getReasonable()

    {

        if (StringUtils.isNull(reasonable))

        {

            return Boolean.TRUE;

        }

        return reasonable;

    }