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

huanghongfa

2021-08-26 c161f8538c248a6bd01054b8e5b79a1b2d5dd476

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/DateScreenVO.java

@@ -1,10 +1,11 @@
package com.panzhihua.common.model.vos.screen;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

import java.util.Date;

@Data
@ApiModel("事件格式化类")