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

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

 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;



/**