Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930

 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());

        }

    }