代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java

@@ -20,7 +20,7 @@
    @ApiModelProperty("评论内容")
    private String comment;

    @ApiModelProperty(value = "评论者id",hidden = true)
    @ApiModelProperty(value = "评论者id", hidden = true)
    private Long userId;

}