From 4f5d220cd175b1cb48c6fc91cb02cb12f6114746 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 18 八月 2025 11:10:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
index 3e239bd..8b9940c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
@@ -18,11 +18,19 @@
@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