From fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/CouponVirtual.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 1e8855e..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;
/**
* 铏氭嫙鍟嗗搧浼樻儬鍗�
@@ -21,6 +25,11 @@
@TableField("order_id")
/** 璁㈠崟id */
private String orderId;
+
+
+ @TableField("item_order_id")
+ /** 璁㈠崟id */
+ private String itemOrderId;
@TableField("goods_id")
/** 鍟嗗搧id */
@@ -56,7 +65,9 @@
@TableField("claim_time")
/** 棰嗗彇鏃堕棿 */
- private String claimTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date claimTime;
@TableField("name")
/** 鍚嶇О */
--
Gitblit v1.8.0