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

huanghongfa

2021-05-19 14590de8e4fb23909f1767a53d1f92007f9bbcc4

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -32,5 +33,9 @@
    @ApiModelProperty("志愿者参加的已经完成的活动")
    private List<ComActActivityVO> comActActivityVOList;

    @ApiModelProperty("时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;


}