From b85427676fedd373e955f24627764b8e5a29c816 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 三月 2024 17:10:28 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 66956dd..6bdf8d8 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,16 @@
package com.dsh.course.entity;
-import java.util.Date;
-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 com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* <p>
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_course_package_discount")
-public class TCoursePackageDiscount {
+public class TCoursePackageDiscount extends Model<TCoursePackageDiscount> {
private static final long serialVersionUID = 1L;
@@ -35,6 +36,7 @@
/**
* 课包id
*/
+ @TableField("coursePackageId")
private Integer coursePackageId;
/**
* 课包价格规则id
@@ -44,27 +46,35 @@
/**
* 折扣类型（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")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
-
+ @TableField("status")
+ private Integer status;
}
--
Gitblit v1.7.1