From 79e1fa7c5b198d16f43832bb5896b5072f3e5f11 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 五月 2024 20:13:49 +0800
Subject: [PATCH] Merge branch 'dev-mitao'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderMall.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderMall.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderMall.java
index 0041f41..fdb6e27 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderMall.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderMall.java
@@ -41,9 +41,12 @@
@ApiModelProperty(value = "订单id")
private Long orderId;
- @ApiModelProperty(value = "商品id/秒杀商品id/团购商品id")
+ @ApiModelProperty(value = "商品id")
private Long goodsSkuId;
+ @ApiModelProperty(value = "秒杀/团购 商品id")
+ private Long activityId;
+
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
--
Gitblit v1.7.1