From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java
index f8804a8..9f3c82c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -57,11 +58,13 @@
* 开始时间
*/
@TableField("startTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 结束时间
*/
@TableField("endTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date endTime;
/**
* 赠送课时
@@ -77,6 +80,7 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
--
Gitblit v1.7.1