From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/UserCoupon.java | 7 +++++++
1 files changed, 7 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 8ce4a39..12354c3 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;
@@ -36,27 +37,33 @@
/**
* 优惠券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;
--
Gitblit v1.7.1