From 883d16070288862180dd65fc58e7927f9040a30d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 16:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
index 4eba57f..382829b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java
@@ -35,7 +35,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 类型（1=实体商品，2=课包商品，3=门票商品）
+ * 类型（1=实体商品，2=课包商品，3=门票商品 4=优惠券）
*/
@TableField("type")
private Integer type;
@@ -149,7 +149,11 @@
*/
@TableField("insertTime")
private Date insertTime;
-
+ /**
+ * 课包支付配置id
+ */
+ @TableField("coursePackageConfigId")
+ private Integer coursePackageConfigId;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1