From 9e2531a4ab84eba862c7b0c825a73e04c100972e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 30 Jan 2024 22:43:11 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
index 0acf05d..fb4061a 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
@@ -15,11 +15,20 @@
 @ApiModel(value = "OrderListItemVo", description = "订单列表明细返回参数类")
 public class OrderItemVo {
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     @ApiModelProperty(value = "skuId")
     private Long skuId;
 
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
+
+    @ApiModelProperty(value = "优惠卷ID")
+    private Long memberCouponId;
+
+    @ApiModelProperty(value = "推销员邀请码")
+    private String memberInviteId;
 
     @ApiModelProperty(value = "样式名称")
     private String styleName;
@@ -35,4 +44,13 @@
 
     @ApiModelProperty(value = "单价")
     private BigDecimal price;
+
+    @ApiModelProperty(value = "1-普通商品 2-套餐")
+    private Integer isNormal;
+
+    @ApiModelProperty(value = "商品ID")
+    private Long goodsId;
+
+    @ApiModelProperty(value = "1:正常 2:退款中3:已退")
+    private Integer state;
 }

--
Gitblit v1.9.1