From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberGiftRecord.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberGiftRecord.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberGiftRecord.java
index 39f1691..8950d83 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberGiftRecord.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/MemberGiftRecord.java
@@ -49,19 +49,24 @@
* 礼品id
*/
@TableField("gift_id")
- private Long giftId;
+ private String giftId;
/**
* 礼物来源1平台2商户
*/
@TableField("gift_from")
private Integer giftFrom;
/**
+ * 奖品来源（1=生日卡，2=抽奖）
+ */
+ @TableField("prize_from")
+ private Integer prizeFrom;
+ /**
* 商户id
*/
@TableField("shop_id")
private Long shopId;
/**
- * 礼物类型1优惠券2商品3现金4实物
+ * 礼物类型1优惠券2商品3现金4实物5积分
*/
@TableField("gift_type")
private Integer giftType;
@@ -100,6 +105,11 @@
*/
private BigDecimal money;
/**
+ * 积分数量
+ */
+ @TableField("integral_number")
+ private Integer integralNumber;
+ /**
* 创建时间
*/
@TableField("create_time")
@@ -126,6 +136,8 @@
@TableField("verify_status")
private Integer verifyStatus;
+ @TableField("verify_time")
+ private Date verifyTime;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1