From 1d07f8271751880bdfbf3ea41e696f9ee719888b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 17 八月 2023 08:48:36 +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 |    7 +++++++
 1 files changed, 7 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 dcb3bc7..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;
@@ -49,6 +50,11 @@
     @TableField("coursePackagePaymentId")
     private Long coursePackagePaymentId;
     /**
+     * 排课记录id
+     */
+    @TableField("coursePackageSchedulingId")
+    private Long coursePackageSchedulingId;
+    /**
      * 消课凭证
      */
     @TableField("voucher")
@@ -62,6 +68,7 @@
      * 添加时间
      */
     @TableField("insertTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
 
 

--
Gitblit v1.7.1