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

---
 cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/UserCoupon.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/UserCoupon.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/UserCoupon.java
index 9a82e0b..9a88dc4 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/UserCoupon.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/UserCoupon.java
@@ -1,5 +1,6 @@
 package com.dsh.course.feignclient.activity.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -38,4 +39,14 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
+    /**
+     * 是否为会员赠送 0否1是
+     */
+    @TableField("isVipGrant")
+    private Integer isVipGrant;
+    /**
+     * vipDetailId 会员权益赠送记录id
+     */
+    @TableField("vipDetailId")
+    private Integer vipDetailId;
 }

--
Gitblit v1.7.1