From b38caa7012b8da89d5ca61d389258d4fd8d9172e Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期三, 09 八月 2023 17:51:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java | 14 +++++++++++--- 1 files changed, 11 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..15678af 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,6 +1,7 @@ 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; @@ -30,32 +31,39 @@ /** * 主键 */ - @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; /** * 到课状态(0=否,1=是) */ + @TableField("signInOrNot") private Integer signInOrNot; /** * 预约状态(0=取消,1=预约) */ + @TableField("reservationStatus") private Integer reservationStatus; + @TableField("insertTime") private Date insertTime; -- Gitblit v1.7.1