From 93707c75f49a543f122349f88b53d65aac51861b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 10:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 c5a52e4..64bac1d 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
@@ -36,8 +36,8 @@
     @ApiModelProperty("商品主图")
     private String goodsPic;
 
-    @ApiModelProperty("商品描述")
-    private String goodsDescribe;
+    @ApiModelProperty("商品详情")
+    private String details;
 
     @ApiModelProperty("商品规格")
     private List<AddShopGoodsAttrVO> goodsAttrVOList;

--
Gitblit v1.7.1