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/TCoursePackageDiscount.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java
index 84b0fb4..d8be4e7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java
@@ -1,15 +1,14 @@
package com.dsh.course.entity;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
+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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* <p>
@@ -23,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_course_package_discount")
-public class TCoursePackageDiscount extends Model<TCoursePackageDiscount> {
+public class TCoursePackageDiscount {
private static final long serialVersionUID = 1L;
@@ -35,36 +34,43 @@
/**
* 课包id
*/
+ @TableField("coursePackageId")
private Integer coursePackageId;
+ /**
+ * 课包价格规则id
+ */
+ @TableField("coursePackagePaymentConfigId")
+ private Integer coursePackagePaymentConfigId;
/**
* 折扣类型（1=会员折扣，2=续课优惠，3=限时折扣，4=赠送课时）
*/
+ @TableField("type")
private Integer type;
/**
- * 折扣优惠规则JSON
+ * 折扣优惠规则JSON ->详见 DiscountJsonDto类
*/
+ @TableField("content")
private String content;
/**
* 审核状态（1=待审核，2=已通过，3=已拒绝）
*/
+ @TableField("auditStatus")
private Integer auditStatus;
/**
* 审核人id
*/
+ @TableField("auditUserId")
private Integer auditUserId;
/**
* 审核备注
*/
+ @TableField("auditRemark")
private String auditRemark;
/**
* 添加时间
*/
+ @TableField("insertTime")
private Date insertTime;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.7.1