Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

4 天以前 8c8d8769f5e23439f7d44c300eba763ee64b2352

 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;

    }