合并

MrShi

昨天 297734ace4c05848b28a792fa89f38bee67be3c1

 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;