From cabda12d788eeb6e056113ac8352dfaf972490d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 17:10:44 +0800
Subject: [PATCH] bug修改,后台新增预约记录,玩湃惠民卡修改二维码参数规则,启动游戏取消校验是否订场校验
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 8ce4a39..d05dab1 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
@@ -1,6 +1,7 @@
package com.dsh.activity.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -31,35 +32,52 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
/**
* 优惠券id
*/
+ @TableField("couponId")
private Integer couponId;
/**
* 用户id
*/
+ @TableField("userId")
private Integer userId;
/**
* 状态(1=待核销,2=已核销)
*/
+ @TableField("status")
private Integer status;
/**
* 核销人员id
*/
+ @TableField("verificationUserId")
private Integer verificationUserId;
/**
* 核销时间
*/
+ @TableField("verificationTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date verificationTime;
/**
* 领取时间
*/
+ @TableField("insertTime")
@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;
+ @TableField(exist = false)
+ private Integer siteId;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1