From a834326805b2ca86c54437a22bb41a23eceace3f Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Fri, 10 Nov 2023 18:08:43 +0800 Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka --- src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java index 78ef1f8..6c4c3ec 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java @@ -70,7 +70,9 @@ private String memberEmail; - private Integer carriage; + private BigDecimal carriage; + + private BigDecimal goodsAmount; //配送方式 1:自提 2:快递 private Integer deliveryType; @@ -83,4 +85,6 @@ private String leaderName; //商品名称 private String goodsName; + + private String refererName; } -- Gitblit v1.9.1