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

manailin

2021-06-21 06620a6b0e64126e216edab8fced4597b38936b3

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

@@ -20,6 +20,8 @@
    private Long id;
    @ApiModelProperty("名字")
    private String name;
    @ApiModelProperty("用户昵称")
    private String nickName;
    @ApiModelProperty("身份")
    private String identity;
    @ApiModelProperty("手机号")