From 0e7584f11e1da29ce07f5f21048197dd155f1574 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 09:47:17 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
index c7f7f23..1e70da8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopFlowerGoodsVO.java
@@ -49,7 +49,7 @@
     /**
      * 配送方式(1.商家配送 2.快递物流)
      */
-    @ApiModelProperty(value = "配送方式(1.商家配送  2.快递物流)", hidden = true)
+    @ApiModelProperty(value = "配送方式(1.自提  2.快递)")
     private Integer deliveryType;
 
     @ApiModelProperty("商品规格")

--
Gitblit v1.7.1