Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

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

@@ -1,12 +1,12 @@
package com.moral.common.bean;

import lombok.Data;
import lombok.Getter;
import lombok.Setter;

import java.util.List;

@Getter
@Setter
@Data
public class PageResult {

    private Long total;