From b62edba94cc796bf3aecc893ae3a290a02317e14 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 20:09:46 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

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

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
index 85089a9..3e0531e 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
@@ -33,4 +33,10 @@
 
     @ApiModelProperty(value = "订单明细")
     private List<OrderItemVo> items;
+
+    @ApiModelProperty(value = "订单类型 1-普通订单 2-积分订单")
+    private Integer orderType;
+
+    @ApiModelProperty(value = "运费")
+    private BigDecimal carriage;
 }

--
Gitblit v1.9.1