From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java
index edb6926..21b24b2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java
@@ -1,7 +1,7 @@
package com.dsh.activity.model;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
@Data
@@ -9,14 +9,17 @@
/**
* 条件金额
*/
- double conditionalAmount;
+ @ApiModelProperty("条件金额(例如 ：满xx可用)")
+ String conditionalAmount;
/**
* 抵扣金额(代金券 取 该字段)
*/
- double deductionAmount;
+ @ApiModelProperty("抵扣金额(代金券 取 该字段) 例如：¥ xxx")
+ String deductionAmount;
/**
* 体验券名称
*/
+ @ApiModelProperty("体验券名称/抵扣券商品名称 ")
String experienceName;
}
--
Gitblit v1.7.1