From 2a212f983f35e1c569dfec3a172fb5f0c9f85fac Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java
index f533aec..9e871d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopFlowerOrderStoreListVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -58,5 +59,15 @@
@ApiModelProperty(value = "收货人详细地址")
private String detailAddress;
+ @ApiModelProperty(value = "自提点id")
+ private Long pointId;
+ @ApiModelProperty(value = "自提点信息")
+ private ConvenientElevatingPointVO convenientElevatingPointVO;
+
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
}
--
Gitblit v1.7.1