Merge remote-tracking branch 'origin/master'

doum

昨天 1c7c8e034add7e68602bdb56be08f63bac1262b7

 server/dmmall_service/src/main/java/com/doumee/core/model/PageData.java

@@ -25,7 +25,8 @@

    @ApiModelProperty("总记录数")
    private long total;

    @ApiModelProperty("统计数据对象")
    private T countData;
    @ApiModelProperty("当前页的数据")
    private List<T> records;