From 2cdbb69378ac6af3786b8800977de437ba53241c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 15:47:41 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..e652994 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
@@ -1,14 +1,15 @@
package com.panzhihua.common.model.vos.shop;
+import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
-
-import java.util.List;
-
/**
* @auther lyq
@@ -19,7 +20,7 @@
@ApiModel("商城店铺")
public class PageShopStoreVO {
- @ApiModelProperty("负责人")
+ @ApiModelProperty("商家、联系人")
private String contacts;
@ApiModelProperty("店铺登陆账号")
@@ -28,11 +29,11 @@
@ApiModelProperty("联系方式")
private String phone;
-
@ApiModelProperty("店铺状态（1.启用 2.禁用）")
private Integer status;
@ApiModelProperty("店铺id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("店铺名称")
@@ -57,7 +58,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