From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java
index 6d9629e..cafcdc2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java
@@ -41,7 +41,7 @@
@TableField("name")
private String name;
/**
- * 优惠券类型（1=满减券，2=代金券，3=体验券）
+ * 优惠券类型（1=满减券，2=代金券，3=体验券 4=抵扣券）
*/
@TableField("type")
private Integer type;
@@ -158,6 +158,12 @@
*/
@TableField("cityManagerId")
private Integer cityManagerId;
+ /**
+ * 积分商品id
+ */
+ @TableField("goodsId")
+ private Integer goodsId;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1