Merge remote-tracking branch 'origin/master'

doum

昨天 b902b40fda2f1dccca0825277d07908119deecfd

 server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/ActivityReplyCommentDTO.java

@@ -22,7 +22,7 @@
    private Integer memberId;

    @ApiModelProperty(value = "用户昵称" )
    private String memberNikeName;
    private String nikeName;

    @ApiModelProperty(value = "用户昵称" )
    private String memberImgUrl;