Merge remote-tracking branch 'origin/master'

doum

16 小时以前 ae917e09a897843344424ca7d36dd22c216f5f50

 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;

}