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

huanghongfa

2021-09-16 a824e3b0f4b9f2f1d45f7195eb1fec2a6f5ba2a9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java

@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.advertisement;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -56,6 +57,5 @@
    @ApiModelProperty("编辑时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;


}