From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 5477444..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
@@ -58,13 +58,13 @@
* 开始时间
*/
@TableField("startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+ @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")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date endTime;
/**
* 赠送课时
@@ -80,7 +80,7 @@
* 添加时间
*/
@TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
--
Gitblit v1.7.1