From bec7abc34ffb9a9de3f5d225bf233a311ff68938 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Jun 2022 16:36:32 +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/MallGoodsDetailsVo.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index 1a00506..3a457fb 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -51,6 +51,15 @@
     @ApiModelProperty(value = "积分")
     private BigDecimal score;
 
+    @ApiModelProperty(value = "是否有运费")
+    private Integer hasCarriage;
+
+    @ApiModelProperty(value = "运费")
+    private BigDecimal carriage;
+
+    @ApiModelProperty(value = "1-普通商品 2-套餐")
+    private Integer isNormal;
+
     @ApiModelProperty(value = "轮播图")
     private List<String> images;
 

--
Gitblit v1.9.1