Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 454e8c85ee7f47ff82fa93d502bde832c8f888f9

 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;