Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

 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;