From 6357f89bf38b83b779e233249c2b0e480b78e164 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期六, 23 九月 2023 17:24:16 +0800
Subject: [PATCH] 学员

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandise.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 989c500..9b7bd28 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;
@@ -68,7 +68,7 @@
      * 所属积分
      */
     @TableField("integral")
-    private BigDecimal integral;
+    private Integer integral;
     /**
      * 商品封面
      */
@@ -149,7 +149,18 @@
      */
     @TableField("insertTime")
     private Date insertTime;
-
+    /**
+     * 课包支付配置id
+     */
+    @TableField("coursePackageConfigId")
+    private Integer coursePackageConfigId;
+    /**
+     * 1=上架 2=下架
+     */
+    @TableField("shelves")
+    private Integer shelves;
+    @TableField("cardType")
+    private Integer cardType;
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1