From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 14 六月 2024 19:41:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java index 38ad327..15072c0 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java +++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageOrder.java @@ -90,6 +90,11 @@ @TableField("payUserId") private Integer payUserId; /** + * 课程状态(1=正常,2=已退课) + */ + @TableField("status") + private Integer status; + /** * 状态(1=正常,2=冻结,3=删除) */ @TableField("state") @@ -110,6 +115,11 @@ */ @TableField("salesName") private String salesName; + /** + * 订单类型(1=购买订单,2=积分商品兑换订单) + */ + @TableField("orderType") + private Integer orderType; @TableField(exist = false) private Integer type; -- Gitblit v1.7.1