From 1eed180f9c2bf73130ddcab66d25e6a641660ff0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:13:33 +0800
Subject: [PATCH] 合并代码
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
index 183ed83..2a11feb 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
@@ -19,9 +19,15 @@
@ApiModelProperty(value = "商品名称")
private String commodityName;
+ @ApiModelProperty(value = "1=积分，2=现金+积分, 3=现金")
+ private Integer redemptionMethod;
+
@ApiModelProperty(value = "商品价格")
private BigDecimal commodityPrice;
+ @ApiModelProperty(value = "支付积分")
+ private Integer integral;
+
@ApiModelProperty(value = "商品类型")
private Integer goodsType;
--
Gitblit v1.7.1