From 83070ae1b6c99bff833b9a43910b58b970037383 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 6f5eefc..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,14 +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