Merge remote-tracking branch 'origin/master'

rk

昨天 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 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;