Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -77,4 +77,7 @@
    @ApiModelProperty("二级评论集合")
    private List<ComActDiscussCommentVO> comActDiscussCommentVOList;

    @ApiModelProperty("评论人用户类型（1.小程序用户（其他均为后台用户））")
    private Integer userType;

}