From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
index 9ff01b0..3e790a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
@@ -49,6 +49,12 @@
@ApiModelProperty("商品详情")
private String details;
+ /**
+ * 配送方式（1.商家配送 2.快递物流）
+ */
+ @ApiModelProperty(value = "配送方式（1.商家配送 2.快递物流）",hidden = true)
+ private Integer deliveryType;
+
@ApiModelProperty("商品规格")
@Valid
private List<AddShopGoodsAttrVO> goodsAttrVOList;
--
Gitblit v1.7.1