Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 06ceee5a4f820ebb19dd66388c958d8638fa1b54

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java

@@ -25,6 +25,7 @@
    private Long id;

    @ApiModelProperty("一起议主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long discussId;

    @ApiModelProperty("评论内容")
@@ -41,6 +42,7 @@
    private Integer isAuthor;

    @ApiModelProperty("上级评论id 默认0表示一级评论")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;

    @ApiModelProperty("用户主键")