Merge remote-tracking branch 'origin/master'

doum

17 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Collect.java

@@ -111,6 +111,10 @@
    private String content;


    @ApiModelProperty(value = "社区封面图")
    @TableField(exist = false)
    private String activityImgurl;



}