From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
index 4612d7a..7f29366 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
@@ -28,6 +28,9 @@
@ApiModelProperty(value = "商品简介")
private String goodsIntroduction;
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
@ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
private Integer goodsType;
@@ -38,7 +41,7 @@
private Integer buyNum;
@ApiModelProperty(value = "优惠券id")
- private String memberCouponId;
+ private Long memberCouponId;
@ApiModelProperty(value = "商品售价")
@JsonSerialize(using = ToStringSerializer.class)
--
Gitblit v1.7.1