From 36ce1f3549df46609b4e3bc0bf0810bd0c85277e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 17:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java b/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
index 98aebed..01c601d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/model/OrderGood.java
@@ -7,6 +7,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -36,10 +37,18 @@
@TableField("order_id")
private Integer orderId;
+ @ApiModelProperty(value = "商品券优惠金额")
+ @TableField("good_amount")
+ private BigDecimal goodsCouponAmount;
+
@ApiModelProperty(value = "购买商品的json快照")
@TableField("good_json")
private String goodJson;
+ @ApiModelProperty(value = "秒杀活动json快照")
+ @TableField("seckill_json")
+ private String seckillJson;
+
@ApiModelProperty(value = "数量")
@TableField("num")
private Integer num;
--
Gitblit v1.7.1