[修改]合并test_excel分支到test分支。解决部分冲突。

manailin

2021-06-21 06620a6b0e64126e216edab8fced4597b38936b3

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

@@ -35,6 +35,9 @@
    @ApiModelProperty("评论人名字")
    private String name;

    @ApiModelProperty("评论人昵称")
    private String nickName;

    @ApiModelProperty("评论人头像")
    private String url;