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

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 7bcbd04..16f5327 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
@@ -19,7 +19,7 @@
 @ApiModel("商城店铺")
 public class PageShopStoreVO {
 
-    @ApiModelProperty("负责人")
+    @ApiModelProperty("商家、联系人")
     private String contacts;
 
     @ApiModelProperty("店铺登陆账号")
@@ -57,6 +57,9 @@
     @ApiModelProperty("店铺销量")
     private Integer sale;
 
+    @ApiModelProperty("店铺登陆密码")
+    private String storePassword;
+
     @ApiModelProperty("店内商品列表")
     private List<ComShopGoodsVO> goodsList;
 

--
Gitblit v1.7.1