From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改

---
 manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java b/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java
index 4bc9566..3436293 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TCouponReceive.java
@@ -7,6 +7,8 @@
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import com.jilongda.common.pojo.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,7 +26,7 @@
 @EqualsAndHashCode(callSuper = false)
 @TableName("t_coupon_receive")
 @ApiModel(value="TCouponReceive对象", description="优惠券")
-public class TCouponReceive implements Serializable {
+public class TCouponReceive extends BaseModel {
 
     private static final long serialVersionUID = 1L;
 
@@ -35,6 +37,9 @@
     @ApiModelProperty(value = "优惠券id")
     @TableField("couponId")
     private Integer couponId;
+    @ApiModelProperty(value = "优惠券名称")
+    @TableField("couponName")
+    private String couponName;
 
     @ApiModelProperty(value = "用户id")
     @TableField("userId")
@@ -50,11 +55,14 @@
 
     @ApiModelProperty(value = "门店id 字段为null表示全部")
     @TableField("storeId")
-    private Integer storeId;
+    private String storeId;
 
     @ApiModelProperty(value = "有效期截止日期")
     @TableField("endTime")
     private LocalDateTime endTime;
+    @ApiModelProperty(value = "使用时间")
+    @TableField("useTime")
+    private LocalDateTime useTime;
 
     @ApiModelProperty(value = "优惠条件金额 为0则表示通用券")
     @TableField("amountCondition")
@@ -63,24 +71,5 @@
     @ApiModelProperty(value = "1待使用 2已使用 3已过期")
     @TableField("status")
     private Integer status;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("createTime")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("updateTime")
-    private LocalDateTime updateTime;
-
-    @TableField("createBy")
-    private String createBy;
-
-    @TableField("updateBy")
-    private String updateBy;
-
-    @ApiModelProperty(value = "是否删除 0否1是")
-    @TableField("isDelete")
-    private Integer isDelete;
-
 
 }

--
Gitblit v1.7.1