From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java
index 986b38d..767ae15 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.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;
@@ -52,7 +53,12 @@
* 课包购买记录id
*/
@TableField("coursePackagePaymentId")
- private Integer coursePackagePaymentId;
+ private Long coursePackagePaymentId;
+ /**
+ * 排课记录id
+ */
+ @TableField("coursePackageSchedulingId")
+ private Long coursePackageSchedulingId;
/**
* 到课状态（0=否，1=是）
*/
@@ -64,6 +70,7 @@
@TableField("reservationStatus")
private Integer reservationStatus;
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
--
Gitblit v1.7.1