From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 08 八月 2023 17:25:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 c5b362d..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 @@ -149,7 +149,11 @@ */ @TableField("insertTime") private Date insertTime; - + /** + * 课包支付配置id + */ + @TableField("coursePackageConfigId") + private Integer coursePackageConfigId; @Override protected Serializable pkVal() { -- Gitblit v1.7.1