Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 e60f6e849f43cb894fb96646de71304cf2524827

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

@@ -45,6 +45,7 @@
            this.size = page.size();

        }else{

            this.data = list;

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

        }

    }