Merge branch 'test_warehouse' into test

101captain

2021-10-15 9bfe692752f1dc1a2a0c0c825a88335de30b92f6

 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("事件格式化类")