From f21cf2729f0ebf3cfea564c8bc0fc7349cdabe48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 十二月 2023 09:23:56 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
index c9e7694..96b44df 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
@@ -22,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_course_package_payment")
-public class TCoursePackagePayment extends Model<TCoursePackagePayment>{
+public class TCoursePackagePayment extends Model<TCoursePackagePayment> {
private static final long serialVersionUID = 1L;
/**
@@ -165,7 +165,36 @@
@TableField("salesName")
private String salesName;
+ @TableField(exist = false)
+ private String studentName;
+ @TableField(exist = false)
+
+ private String province;
+ @TableField(exist = false)
+
+ private String city;
+ @TableField(exist = false)
+
+ private String courseName;
+ @TableField(exist = false)
+
+ private Integer hasHours;
+ @TableField(exist = false)
+
+ private BigDecimal laveCashPayment;
+ @TableField(exist = false)
+
+ private BigDecimal cashPayment1;
+
@TableField(exist = false)
private Integer type;
+
+ @TableField(exist = false)
+ private Integer orderId;
+ @TableField("giftClassHours")
+ private Integer giftClassHours;
+ // 所选课时规格id
+ @TableField(exist = false)
+ private Integer coursePackageConfigId;
}
--
Gitblit v1.7.1