From d462cdb62cc5a55c5a3e94899dab7f5c035b8f23 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 10:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 98e53c1..2869623 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
@@ -28,8 +28,8 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.INPUT)
+ private Long id;
/**
* 用户id
*/
@@ -45,12 +45,20 @@
/**
* 支付方式（1=现金，2=玩湃币）
*/
- private Integer payType;
+ private String payType;
/**
* 课时数
*/
private Integer classHours;
/**
+ * 原价
+ */
+ private Double originalPrice;
+ /**
+ * 优惠券id
+ */
+ private Long userCouponId;
+ /**
* 现金支付价格
*/
private BigDecimal cashPayment;
--
Gitblit v1.7.1