Merge branch 'test' into 'lyq'

罗元桥

2021-05-25 543aecbc143b113e81c887a3a7ebb72213faf5bd

 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;


}