Merge branch 'master' into 'test'

罗yu 元桥

2021-04-28 b6082fe75b377ac9c177736d98f36ae46e7cdb70

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

@@ -77,5 +77,9 @@
    private Integer integral;

    @ApiModelProperty(value = "用户userid",hidden = true)
    @Deprecated
    private Long userId;

    @ApiModelProperty(value = "申请提交人ID",hidden = true)
    private Long submitUserId;
}