Merge remote-tracking branch 'origin/master'

rk

昨天 bd491c37218b0b3d9b518e4814967d814e781c02

 server/dmmall_service/src/main/java/com/doumee/dao/web/dto/coffeebean/CoffeeBeanTaskDTO.java

@@ -22,6 +22,6 @@
    private String label;

    @ApiModelProperty(value = "完成次数 | 每周 分享资讯 4   分享邀请海报 1 发布评论 4 ")
    private Integer doneCount;
    private long doneCount;

}