Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

@@ -43,6 +43,9 @@
            this.pages = page.getPages();

            this.data= new ArrayList<>(list);

            this.size = page.size();

        }else{

            this.data = list;

            this.total = Integer.toUnsignedLong(list.size());

        }

    }