From e86ed626de30e3e60ba5e1294b0d134546ac5b4d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 12:06:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java |    9 +++++++++
 1 files changed, 9 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..b3bea84 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")
@@ -73,7 +76,13 @@
     @ApiModelProperty(value = "状态(1=未使用,2=已使用)")
     @TableField("status")
     private Integer status;
+    @ApiModelProperty(value = "订单id 后台发放的优惠券没有订单id")
+    @TableField("orderId")
+    private Long orderId;
 
+    @ApiModelProperty(value = "当前领取优惠卷的json记录")
+    @TableField("coupon_json")
+    private String couponJson;
 
 
 

--
Gitblit v1.7.1