From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java | 9 +++++++++
1 files changed, 9 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 400d0b7..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,11 +19,20 @@
@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;
+ @ApiModelProperty(value = "排序")
+ private Integer sort;
+
}
--
Gitblit v1.7.1