From 14f62b1e99c93facce4245dbae56b9f43cb0e017 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 18 九月 2024 18:23:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
index 882c0a5..519c74a 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
@@ -45,6 +45,9 @@
@ApiModelProperty(value = "结束时间")
@TableField("end_time")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "开始时间")
+ @TableField("start_time")
+ private LocalDateTime startTime;
@ApiModelProperty(value = "获得方式（1=积分兑换，2=现金购买）")
@TableField("ways_to_obtain")
@@ -74,6 +77,9 @@
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "当前领取优惠卷的json记录")
+ @TableField("coupon_json")
+ private String couponJson;
--
Gitblit v1.7.1