From 094a72e2e2861ae9e088e6e76da49f0825bfed6e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 16:49:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/java/com/jilongda/applet/model/TCoupon.java | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/model/TCoupon.java b/applet/src/main/java/com/jilongda/applet/model/TCoupon.java
index 2e2e0de..a027c22 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TCoupon.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TCoupon.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")
@ApiModel(value="TCoupon对象", description="优惠券领取记录")
-public class TCoupon implements Serializable {
+public class TCoupon extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -34,7 +36,7 @@
@ApiModelProperty(value = "优惠券名称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "发放方式 1注册发放 2全局发放 3指定发放 4扫码发放")
@TableField("type")
@@ -44,35 +46,17 @@
@TableField("amount")
private BigDecimal amount;
- @ApiModelProperty(value = "门店id 字段为null表示全部")
+ @ApiModelProperty(value = "门店id 字段为null表示全部,逗号分隔")
@TableField("storeId")
- private Integer storeId;
+ private String storeId;
- @ApiModelProperty(value = "有效期(天)最高365")
+ @ApiModelProperty(value = "有效期(天)最高365 0无限期")
@TableField("time")
private Integer time;
@ApiModelProperty(value = "优惠条件金额 为0则表示通用券")
@TableField("amountCondition")
private BigDecimal amountCondition;
-
- @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;
@ApiModelProperty(value = "发放状态1发放中 2暂停发放 只有发放方式为1和4的时候存储")
@TableField("grantStatus")
--
Gitblit v1.7.1