From 75d8795d4a8444071f348be4082455f2ca078ffe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageScheduling.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageScheduling.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageScheduling.java
index 3279bd3..c78d505 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageScheduling.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageScheduling.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;
@@ -34,6 +35,21 @@
@TableId(value = "id", type = IdType.NONE)
private Long id;
/**
+ * 1=常规，2=假期，3=体验购课
+ */
+ @TableField("type")
+ private Integer type;
+ /**
+ * 用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ * 学员id
+ */
+ @TableField("studentId")
+ private Integer studentId;
+ /**
* 课包id
*/
@TableField("coursePackageId")
@@ -42,7 +58,14 @@
* 上课日期
*/
@TableField("classDate")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date classDate;
+ /**
+ * 结束时间
+ */
+ @TableField("endDate")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endDate;
/**
* 课后练习课程id
*/
@@ -52,9 +75,9 @@
* 可获得积分
*/
@TableField("integral")
- private Long integral;
+ private Integer integral;
/**
- * 消课凭证（多个分号分隔）
+ * 消课凭证
*/
@TableField("cancelClasses")
private String cancelClasses;
--
Gitblit v1.7.1