Merge remote-tracking branch 'origin/master'

fengxiang

2017-12-22 3e2436955a5daf512098dc879c470ee88ce003eb

 src/main/java/com/moral/common/bean/PageBean.java

@@ -32,6 +32,7 @@
     * @param navigatePages 页码数量

     */

    public PageBean(List<T> list) {

       super();

        if (list instanceof Page) {

            Page<T> page = (Page<T>) list;

            this.pageIndex = page.getPageNum();

@@ -43,5 +44,8 @@
        }

    }

    

    public PageBean() {

       super();

    }

}