From f4a69a925645fe0c84121fde76ec03aff1b07939 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 11:24:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
index 18a0e1d..f493dbb 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/UserCoupon.java
@@ -11,6 +11,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -31,10 +32,11 @@
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String idStr;
@ApiModelProperty(value = "删除标志（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
--
Gitblit v1.7.1