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 | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 d18a280..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
@@ -1,9 +1,11 @@
package com.dsh.course.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -30,32 +32,45 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
+ @TableField("appUserId")
private Integer appUserId;
/**
* 学员id
*/
+ @TableField("studentId")
private Integer studentId;
/**
* 课包id
*/
+ @TableField("coursePackageId")
private Integer coursePackageId;
/**
* 课包购买记录id
*/
- private Integer coursePackagePaymentId;
+ @TableField("coursePackagePaymentId")
+ private Long coursePackagePaymentId;
+ /**
+ * 排课记录id
+ */
+ @TableField("coursePackageSchedulingId")
+ private Long coursePackageSchedulingId;
/**
* 到课状态（0=否，1=是）
*/
+ @TableField("signInOrNot")
private Integer signInOrNot;
/**
* 预约状态（0=取消，1=预约）
*/
+ @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