From f38d69d70e3e126d2f58971d0b4854f2aa144fc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 22 八月 2025 14:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java
index 349a798..c77b6b8 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java
@@ -71,6 +71,11 @@
      */
     @TableField("isVipGrant")
     private Integer isVipGrant;
+    /**
+     * vipDetailId 会员权益赠送记录id
+     */
+    @TableField("vipDetailId")
+    private Integer vipDetailId;
 
 
     @Override

--
Gitblit v1.7.1