From 80060571acf0c50e868bb0d7368d690d2f496745 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 16:05:42 +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/entity/MallOrderInfo.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index 28e19fa..1950daa 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -71,4 +71,13 @@
     private List<MallOrderItem> items;
 
     private String payImage;
+
+    private String payTradeNo;
+
+    /**
+     * 订单类型 1-普通订单 2-积分订单
+     */
+    private Integer orderType;
+
+    private BigDecimal carriage;
 }

--
Gitblit v1.9.1