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

manailin

2021-06-21 06620a6b0e64126e216edab8fced4597b38936b3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

@@ -34,6 +34,6 @@
    private String releaseContent;

    @ApiModelProperty(value = "社区id",hidden = true)
    private String communityId;
    private Long communityId;

}