From 5ade6f6e4532b65b96d80eabe5d92302f6f817f4 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 13:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
index 0eb2296..f716a63 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.dtos.advertisement;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -39,10 +40,12 @@
@ApiModelProperty(value = "上架时间",example = "2021-01-04 00:00:00")
@NotNull(groups = {AddGroup.class},message = "上架时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date onAt;
- @ApiModelProperty("下架时间")
+ @ApiModelProperty(value = "下架时间",example = "2024-01-04 00:00:00")
@NotNull(groups = {AddGroup.class},message = "下架时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date offAt;
@ApiModelProperty("跳转内容id")
@@ -51,9 +54,9 @@
@ApiModelProperty("跳转url地址")
private String jumpUrl;
- @ApiModelProperty("create_at")
+ @ApiModelProperty(value = "create_at",hidden = true)
private Date createAt;
- @ApiModelProperty("update_at")
+ @ApiModelProperty(value = "update_at",hidden = true)
private Date updateAt;
}
--
Gitblit v1.7.1