From 724eeacdf36ce55fa7538b600b6dfc3ef21bcb75 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 20 五月 2021 13:51:27 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java | 11 ++++++++++-
1 files changed, 10 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..74ed82e 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,7 +57,16 @@
@ApiModelProperty("店铺销量")
private Integer sale;
+ @ApiModelProperty("店铺登陆密码")
+ private String storePassword;
+
@ApiModelProperty("店内商品列表")
private List<ComShopGoodsVO> goodsList;
+ @ApiModelProperty("该商家是否订单完成")
+ private Boolean orderDone;
+
+ @ApiModelProperty("删除状态（1.未删除 2.已删除）")
+ private Integer deleteStatus;
+
}
--
Gitblit v1.7.1