From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
index e9c4168..8b7b58f 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
@@ -25,8 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_course_package")
-public class TCoursePackage extends Model<TCoursePackage>{
-
+public class TCoursePackage extends Model<TCoursePackage> {
private static final long serialVersionUID = 1L;
@@ -169,10 +168,12 @@
private Integer type;
@TableField("needNum")
private Integer needNum;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("startTime")
- @JsonFormat(pattern = "yyyy.MM.dd", timezone = "GMT+8")
private Date startTime;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("endTime")
- @JsonFormat(pattern = "yyyy.MM.dd", timezone = "GMT+8")
private Date endTime;
}
--
Gitblit v1.7.1