From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java
index c28548d..7a88b5c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.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,10 +35,25 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
+ * 消课类型（1=上课消课，2=支付消课）
+ */
+ @TableField("type")
+ private Integer type;
+ /**
* 课包id
*/
@TableField("coursePackageId")
private Integer coursePackageId;
+ /**
+ * 课程支付记录id
+ */
+ @TableField("coursePackagePaymentId")
+ private Long coursePackagePaymentId;
+ /**
+ * 排课记录id
+ */
+ @TableField("coursePackageSchedulingId")
+ private Long coursePackageSchedulingId;
/**
* 消课凭证
*/
@@ -52,6 +68,7 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
--
Gitblit v1.7.1