From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java
index 69d9377..4abbdcc 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java
@@ -13,7 +13,7 @@
*/
private Integer id;
/**
- * 类型（1=实体商品，2=课包商品，3=门票商品）
+ * 类型（1=实体商品，2=课包商品，3=门票商品，4=优惠券）
*/
private Integer type;
/**
@@ -39,7 +39,7 @@
/**
* 所属积分
*/
- private BigDecimal integral;
+ private Integer integral;
/**
* 商品封面
*/
@@ -104,5 +104,9 @@
* 添加时间
*/
private Date insertTime;
+ /**
+ * 课包支付配置id
+ */
+ private Integer coursePackageConfigId;
}
--
Gitblit v1.7.1