From c81d766cd91be3b3a24c8db94dcd93c071a66c62 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 七月 2023 09:30:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java |   10 ++++++++++
 1 files changed, 10 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..dcb3bc7 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
@@ -34,11 +34,21 @@
     @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;
+    /**
      * 消课凭证
      */
     @TableField("voucher")

--
Gitblit v1.7.1