Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

 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;



/**