Merge remote-tracking branch 'origin/master'

doum

18 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

 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;



}