Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 f2b0c39642daf84c37b728d8d5553e866908faf1

 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;