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/dtos/shop/ComShopFlowerOrderDeliveryDTO.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java
index 3fe3129..a287e3d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFlowerOrderDeliveryDTO.java
@@ -25,35 +25,38 @@
/**
* 自提点id
*/
- @ApiModelProperty(value = "自提点id", required = true)
+ @ApiModelProperty(value = "自提点id")
private Long pointId;
/**
* 自提点id
*/
- @ApiModelProperty(value = "自提点名称", required = true)
+ @ApiModelProperty(value = "自提点名称")
private String pointName;
/**
* 配送订单数量
*/
- @ApiModelProperty(value = "配送订单数量", required = true)
+ @ApiModelProperty(value = "配送订单数量")
private Integer deliveryOrderNum;
/**
* 配送商品数量
*/
- @ApiModelProperty(value = "配送商品数量", required = true)
+ @ApiModelProperty(value = "配送商品数量")
private Integer deliveryGoodsNum;
/**
* 价值
*/
- @ApiModelProperty(value = "价值", required = true)
+ @ApiModelProperty(value = "价值")
private BigDecimal deliveryAmount;
- @ApiModelProperty(value = "订单id集合", required = true)
+ @ApiModelProperty(value = "订单id集合")
private List<Long> orderIds;
+
+ @ApiModelProperty(value = "商品id")
+ private Long storeId;
}
--
Gitblit v1.7.1