Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -3,9 +3,7 @@
import java.io.Serializable;

import java.util.ArrayList;

import java.util.List;



import com.github.pagehelper.Page;



import lombok.Data;



/**

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

        }else{

            this.data = list;

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

        }

    }