From e900ccb94046eabeff772f51c9492c3d8cfa2941 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 10:40:58 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/Coupon.java |    7 ++++++-
 1 files changed, 6 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 c6b09b9..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,11 @@
      */
     @TableField("cityManagerId")
     private Integer cityManagerId;
+    /**
+     * 积分商品id
+     */
+    @TableField("goodsId")
+    private Integer goodsId;
 
 
     @Override

--
Gitblit v1.7.1