Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 e60f6e849f43cb894fb96646de71304cf2524827

 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;