From 328105ebdbb82a923c2a02ed01786c129a4aacb1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 23 十月 2025 17:33:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java
index 2d4ef9b..01deb89 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 铏氭嫙鍟嗗搧浼樻儬鍗�
@@ -22,9 +26,18 @@
/** 璁㈠崟id */
private String orderId;
+
+ @TableField("item_order_id")
+ /** 璁㈠崟id */
+ private String itemOrderId;
+
@TableField("goods_id")
/** 鍟嗗搧id */
private String goodsId;
+
+ @TableField("sku_id")
+ /** 鍟嗗搧id */
+ private String skuId;
@TableField("sku_name")
/** 鍟嗗搧鍚嶇О */
@@ -42,6 +55,20 @@
/** 浼樻儬鍗峰悕绉� */
private String couponName;
+ @TableField("user_id")
+ /** 鐢ㄦ埛id */
+ private String userId;
+
+ @TableField("user_nickname")
+ /** 鐢ㄦ埛鏄电О */
+ private String userNickname;
+
+ @TableField("claim_time")
+ /** 棰嗗彇鏃堕棿 */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date claimTime;
+
@TableField("name")
/** 鍚嶇О */
private String name;
--
Gitblit v1.8.0