From ab46a451cf1c94b01e8718e2aa6be6c7fc1886c1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 16 八月 2024 15:32:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index 394efd2..8073eef 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -99,22 +99,26 @@
@TableField("explain")
private String explain;
+ @ApiModelProperty(value = "封面图")
+ @TableField("cover_picture")
+ private String coverPicture;
+ @ApiModelProperty(value = "详情图片")
+ @TableField("details_picture")
+ private String detailsPicture;
+
@ApiModelProperty(value = "说明")
@TableField("remark")
private String remark;
-
@ApiModelProperty(value = "状态（1=上架，2=下架）")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "发放数量")
+ @TableField(exist = false)
+ private Integer count;
+ @ApiModelProperty(value = "使用数量")
+ @TableField(exist = false)
+ private Integer useCount;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
--
Gitblit v1.7.1