From 2a212f983f35e1c569dfec3a172fb5f0c9f85fac Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java
index 318888a..c45e7a3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderCreateDTO.java
@@ -1,5 +1,6 @@
 package com.panzhihua.common.model.dtos.shop;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import io.swagger.annotations.ApiModel;
@@ -41,6 +42,11 @@
 
     @ApiModelProperty(value = "购物车记录id集合(当提交类型为2时,此字段必填)")
     private List<Long> cartIds;
+    /**
+     * 配送方式(1.自提 2.快递)
+     */
+    @ApiModelProperty(value = "配送方式(1.自提 2.快递)")
+    private Integer deliveryType;
 
     /**
      * 提交类型(1.商品详情提交 2.购物车提交)

--
Gitblit v1.7.1