From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
index 5eb8f18..b31b4a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComFlowerOrderListDTO.java
@@ -22,11 +22,18 @@
private Integer status;
@ApiModelProperty(value = "自提点id")
- private Integer pointId;
+ private Long pointId;
@ApiModelProperty(value = "商户id")
private Long storeId;
+ @ApiModelProperty(value = "配送单id")
+ private Long deliveryId;
+
+ @ApiModelProperty(value = "配送方式（1.自提 2.快递）")
+ private Integer deliveryType;
+
+
@ApiModelProperty(value = "用户id", hidden = true)
private Long userId;
}
--
Gitblit v1.7.1