From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
index 7382984..b68c2f0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrder.java
@@ -11,10 +11,12 @@
@Data
@ApiModel
public class ConfirmOrder {
- @ApiModelProperty(value = "购物商品id JSON", required = true)
+ @ApiModelProperty(value = "购物车数据id,数量 JSON[{id:1212,num:2}]", required = true)
private String goodsJson;
@ApiModelProperty(value = "支付方式（1=现金，2=积分）", required = true)
private Integer paymentType;
@ApiModelProperty(value = "核销门店id", required = true)
private Integer shopId;
+ @ApiModelProperty(value = "商品类型（1=服务商品，2=单品商品）", required = true)
+ private Integer type;
}
--
Gitblit v1.7.1