Merge remote-tracking branch 'origin/master'

doum

13 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

@@ -166,7 +166,6 @@
    @TableField(exist = false)
    private Integer zanCount;


    @ApiModelProperty(value = "是否点赞：0=否；1=是")
    @TableField(exist = false)
    private Integer zanStatus;