From f721ee13dc5f95f607bb25b09f73cae6a7123ed9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期六, 17 四月 2021 17:56:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java
index 9184b5e..7bcbd04 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java
@@ -7,6 +7,8 @@
 
 import java.util.Date;
 
+import java.util.List;
+
 
 /**
  * @auther lyq
@@ -46,4 +48,16 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAt;
 
+    @ApiModelProperty("店铺详情")
+    private String storeDetail;
+
+    @ApiModelProperty("店铺描述")
+    private String storeDescribe;
+
+    @ApiModelProperty("店铺销量")
+    private Integer sale;
+
+    @ApiModelProperty("店内商品列表")
+    private List<ComShopGoodsVO> goodsList;
+
 }

--
Gitblit v1.7.1